diff --git a/package.json b/package.json
index bdab39f..60bbe8b 100644
--- a/package.json
+++ b/package.json
@@ -34,7 +34,9 @@
     "@dcloudio/uni-mp-weixin": "^2.0.0-24220191115011",
     "@dcloudio/uni-stat": "^2.0.0-24220191115011",
     "flyio": "^0.6.2",
+    "node-sass": "^4.13.0",
     "regenerator-runtime": "^0.12.1",
+    "sass-loader": "^8.0.0",
     "vue": "^2.6.10",
     "vuex": "^3.0.1"
   },
diff --git a/src/components/addr/addr-add.vue b/src/components/addr/addr-add.vue
new file mode 100644
index 0000000..3ed1509
--- /dev/null
+++ b/src/components/addr/addr-add.vue
@@ -0,0 +1,47 @@
+<template>
+    <view class="addrAdd">
+        <text class="username">{{desc}}</text>
+        <input @input="input" :value=value type="text" class="shuru" placeholder="请输入">
+        <!-- <input type="text" class="shuru" placeholder="请输入" v-ref:mycom> -->
+    </view>
+</template>
+<script>
+export default {
+    name:'addrAdd',
+    props:{
+        desc:{
+            type:String
+        },
+        value:{
+
+        }
+    },
+    methods:{
+        input(a){
+        this.$emit("input",a.detail.value)
+        }
+    }
+}
+// desc : 输入框前面提示的要输入内容
+</script>
+<style lang="scss">
+.addrAdd{
+    height: 91upx;
+    border-top:1upx solid #D9D9D9;
+    border-bottom: 1upx solid #D9D9D9;
+    display: flex;
+    .username{
+        color: #222222;
+        font-size: 22upx;
+        line-height: 91upx;
+        text-indent: 31upx;
+    }
+    .shuru{
+        margin: auto 0;
+        margin-left: 50upx;
+        font-size: 22upx;
+        width: 74%;
+    }
+    
+}
+</style>
\ No newline at end of file
diff --git a/src/components/assess/assess-list.vue b/src/components/assess/assess-list.vue
new file mode 100644
index 0000000..5f769ac
--- /dev/null
+++ b/src/components/assess/assess-list.vue
@@ -0,0 +1,201 @@
+<template>
+  <view class="assessList">
+    <view class="userinfo">
+      <view class="user">
+        <img :src="userpic" alt class="photo" />
+        <view class="info">
+          <text class="username">{{username}}</text>
+          <!-- <text class="proname">{{proname}}</text> -->
+          <view class="stars">
+            <view v-for="item in stararr " :key="item">
+               <img src="../../static/img/star.png" alt class="star" />
+            </view>
+           <text class="pingfen">{{pingfen}}</text>
+          </view>
+        </view>
+      </view>
+      <view class="date">{{date}}</view>
+    </view>
+    <view class="detail">
+      <text class="assessdetail">
+        {{detail}}
+      </text>
+      <!-- <view class="deal">全文</view> -->
+    </view>
+    <view class="pictures">
+      <view v-for="(i,j) in pinglunpic" :key="j">
+        <img :src="i.imgpaththumb	" alt class="shoppic" />
+        <!-- ikjoiphbio -->
+      </view>
+
+      
+    </view>
+    <view class="buyinfo">
+      <view>{{shop}}</view>
+      <view>购买时间：{{buydate}}</view>
+    </view>
+    <view class="line"></view>
+  </view>
+</template>
+
+
+<script>
+export default {
+  name: "assessLIst",
+  data(){
+   return {
+      stararr:[1,2]
+   }
+  },
+  props:{
+    userpic:{
+      type:String
+    },
+    username:{
+      type:String
+    },
+    proname:{
+      type:String
+    },
+    photo:{
+        type:String
+    },
+    detail:{
+        type:String
+    },
+    shop:{
+        type:String
+    },
+    date:{
+        type:String
+    },
+    stars:{
+      type:Number
+    },
+    shoppic:{
+      type:String
+    },
+    pingfen:{
+      type:Number
+    },
+    buydate:{
+      type:String
+    },
+    pinglunpic:{
+      type:Array
+    }
+  },
+  //  username: 评论的用户名  proname 商品名   photo  用户头像  detail   评论内容   date  发表评论的日期  stars 评论几个星星 shoppic  商品图片
+  mounted(){
+      var stararr=[];
+      for(var i=0;i<this.stars;i++){
+        stararr.push(i)
+      }
+      console.log(this.stararr)
+      this.stararr=stararr
+      console.log(this.stararr)
+    },
+  methods:{
+    
+  }
+};
+</script>
+
+<style lang="scss">
+.assessList {
+  .userinfo {
+    display: flex;
+    justify-content: space-between;
+    .user {
+      display: flex;
+      margin-top: 30upx;
+      .photo {
+        width: 49upx;
+        height: 49upx;
+        margin-left: 29upx;
+        margin-right: 18upx;
+      }
+   .info{
+     margin-top: -7upx;
+        .username {
+        color: #333333;
+        font-size: 30upx;
+        padding-right:10upx;
+      }
+      .proname {
+        color: #9b9b9b;
+        font-size: 23upx;
+      }
+      .stars {
+        display: flex;
+        height:6upx;
+        position: relative;
+        top: -15upx;
+        .star {
+          width: 16upx;
+          height: 16upx;
+          margin-right: 9upx;
+        }
+        .pingfen{
+          color: #DF3347;
+          font-size: 22upx;
+          line-height:55upx;
+          margin-left: 16upx;
+        }
+      }
+   }
+    }
+    .date {
+      color: #9b9b9b;
+      font-size: 24upx;
+      margin-right: 34upx;
+      line-height: 100upx;
+    }
+  }
+  .detail {
+    width: 631upx;
+    margin: 0 auto;
+    margin-top:25upx;
+    padding-left: 40upx;
+    .assessdetail {
+      width: 631upx;
+      height: 123upx;
+      color: #686868;
+      font-size: 26upx;
+    }
+    .deal {
+      color: #4372a9;
+      font-size: 23upx;
+    }
+  }
+  .pictures {
+    width: 596upx;
+    display: flex;
+    margin: 0 auto;
+    margin-top:30upx;
+    flex-wrap: wrap;
+
+    .shoppic {
+      width: 139upx;
+      height: 135upx;
+      margin-right: 12upx;
+    }
+  }
+  .buyinfo{
+    width: 624upx;
+    display:flex;
+    justify-content: space-between;
+    font-size: 22upx;
+    color: #999999;
+    margin: 0 auto;
+    margin-top:24upx;
+  }
+  .line{
+    width:679upx;
+    height: 2upx;
+    background-color: #DCDCDC;
+    margin: 0 auto;
+    margin-top:26upx;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/components/assess/assess-top.vue b/src/components/assess/assess-top.vue
new file mode 100644
index 0000000..dc23c4a
--- /dev/null
+++ b/src/components/assess/assess-top.vue
@@ -0,0 +1,51 @@
+<template>
+  <view class="choosesizeTop">
+      <view :class="select[0]" @click="choose" data-type="1">全部99+</view>
+      <view :class="select[1]" @click="choose" data-type="2">晒图43</view>
+  </view>
+</template>
+
+<script>
+export default {
+name:"assessTop",
+data(){
+    return {
+        select:['select','selected'],
+        leixing:2
+    }
+},
+methods:{
+    choose(e){
+        this.leixing=e.currentTarget.dataset.type
+        if(this.leixing==1){
+            this.select=['selected','select']
+        }else{
+            this.select=['select','selected']
+        }
+         this.$emit('changes',this.leixing);
+    }
+}
+}
+</script>
+
+<style lang="scss">
+.choosesizeTop{
+    height: 78upx;
+    background-color: white;
+    border-bottom: 2upx solid #EEEEEE;
+    display: flex;
+    justify-content: space-around;
+        font-size:  26upx;
+        text-align: center;
+        line-height: 78upx;
+    .select{
+        width: 116upx;
+      color:#999999;
+    }
+        .selected{
+        width: 116upx;
+      color:#DD233A;
+      border-bottom: 2upx solid #DD233A;
+    }
+}
+</style>
\ No newline at end of file
diff --git a/src/components/ceshi/ceshi.vue b/src/components/ceshi/ceshi.vue
new file mode 100644
index 0000000..90821cb
--- /dev/null
+++ b/src/components/ceshi/ceshi.vue
@@ -0,0 +1,661 @@
+<template>
+  <view class="i-index i-class">
+    <view>
+      <view class="serch">
+        <searchShuru content="汽车品牌关键字"></searchShuru>
+      </view>
+
+      <xzcxlistTitle title="热门品牌"></xzcxlistTitle>
+      <xzcxlistIconList :iconlist="list.list_hot" @xuanzhong="xuanzhong"></xzcxlistIconList>
+    </view>
+    <slot>
+      <view v-for="(i,j) in list.list_barand" :key="j">
+        <view class="index-title">{{i.szm}}</view>
+        <view
+          class="c"
+          v-for="(item,index) in i.brand_list"
+          :key="index"
+          @click="open('right',item.brand_name,item.brand_logo,item.brand_id)"
+        >
+          <xzcxlistCars :carpic="item.brand_logo" :carname="item.brand_name" class="car"></xzcxlistCars>
+          <!-- <span class="i-index-line"></span> -->
+          <!-- <xzcxlistCars carpic="../../static/img/caricon1.png" carname="阿尔法·罗密欧zz" class="car"></xzcxlistCars> -->
+        </view>
+      </view>
+
+      <!-- <view class="index-title">B</view>
+      <view class="c">
+      <xzcxlistCars carpic="../../static/img/caricon1.png" carname="阿尔法·罗密欧zz" class="car"></xzcxlistCars>
+      <xzcxlistCars carpic="../../static/img/caricon1.png" carname="阿尔法·罗密欧zz" class="car"></xzcxlistCars>
+      <xzcxlistCars carpic="../../static/img/caricon1.png" carname="阿尔法·罗密欧zz" class="car"></xzcxlistCars>
+      </view>
+      <view class="index-title">C</view>
+      <view class="c">
+       <xzcxlistCars carpic="../../static/img/caricon1.png" carname="阿尔法·罗密欧zz" class="car"></xzcxlistCars>
+      <xzcxlistCars carpic="../../static/img/caricon1.png" carname="阿尔法·罗密欧zz" class="car"></xzcxlistCars>
+
+      <xzcxlistCars carpic="../../static/img/caricon1.png" carname="阿尔法·罗密欧zz" class="car"></xzcxlistCars>
+      <xzcxlistCars carpic="../../static/img/caricon1.png" carname="阿尔法·罗密欧zz" class="car"></xzcxlistCars>
+      </view>
+      <view class="index-title">D</view>
+      <view class="c">
+      <xzcxlistCars carpic="../../static/img/caricon1.png" carname="阿尔法·罗密欧zz" class="car"></xzcxlistCars>
+      <xzcxlistCars carpic="../../static/img/caricon1.png" carname="阿尔法·罗密欧zz" class="car"></xzcxlistCars>
+      </view>
+      <view class="index-title">E</view>
+      <view class="c">
+        <xzcxlistCars carpic="../../static/img/caricon1.png" carname="阿尔法·罗密欧zz" class="car"></xzcxlistCars>
+      <xzcxlistCars carpic="../../static/img/caricon1.png" carname="阿尔法·罗密欧zz" class="car"></xzcxlistCars>
+      </view>
+      <view class="index-title">F</view>
+      <view class="c">
+        <xzcxlistCars carpic="../../static/img/caricon1.png" carname="阿尔法·罗密欧zz" class="car"></xzcxlistCars>
+      <xzcxlistCars carpic="../../static/img/caricon1.png" carname="阿尔法·罗密欧zz" class="car"></xzcxlistCars>
+      </view>
+      <view class="index-title">G</view>
+      <view class="c">
+      <xzcxlistCars carpic="../../static/img/caricon1.png" carname="阿尔法·罗密欧zz" class="car"></xzcxlistCars>
+      <xzcxlistCars carpic="../../static/img/caricon1.png" carname="阿尔法·罗密欧zz" class="car"></xzcxlistCars>
+      </view>
+      <view class="index-title">H</view>
+      <view class="c">
+         <xzcxlistCars carpic="../../static/img/caricon1.png" carname="阿尔法·罗密欧zz" class="car"></xzcxlistCars>
+      <xzcxlistCars carpic="../../static/img/caricon1.png" carname="阿尔法·罗密欧zz" class="car"></xzcxlistCars>
+      </view>
+      <view class="index-title">I</view>
+      <view class="c">
+   <xzcxlistCars carpic="../../static/img/caricon1.png" carname="阿尔法·罗密欧zz" class="car"></xzcxlistCars>
+      <xzcxlistCars carpic="../../static/img/caricon1.png" carname="阿尔法·罗密欧zz" class="car"></xzcxlistCars>
+      </view>
+      <view class="index-title">J</view>
+      <view class="c">
+        <xzcxlistCars carpic="../../static/img/caricon1.png" carname="阿尔法·罗密欧zz" class="car"></xzcxlistCars>
+      <xzcxlistCars carpic="../../static/img/caricon1.png" carname="阿尔法·罗密欧zz" class="car"></xzcxlistCars>
+      </view>
+      <view class="index-title">K</view>
+      <view class="c">
+      <xzcxlistCars carpic="../../static/img/caricon1.png" carname="阿尔法·罗密欧zz" class="car"></xzcxlistCars>
+      <xzcxlistCars carpic="../../static/img/caricon1.png" carname="阿尔法·罗密欧zz" class="car"></xzcxlistCars>
+      </view>
+      <view class="index-title">L</view>
+      <view class="c">
+      <xzcxlistCars carpic="../../static/img/caricon1.png" carname="阿尔法·罗密欧zz" class="car"></xzcxlistCars>
+      <xzcxlistCars carpic="../../static/img/caricon1.png" carname="阿尔法·罗密欧zz" class="car"></xzcxlistCars>
+      </view>
+      <view class="index-title">M</view>
+      <view class="c">
+         <xzcxlistCars carpic="../../static/img/caricon1.png" carname="阿尔法·罗密欧zz" class="car"></xzcxlistCars>
+      <xzcxlistCars carpic="../../static/img/caricon1.png" carname="阿尔法·罗密欧zz" class="car"></xzcxlistCars>
+      </view>
+      <view class="index-title">N</view>
+      <view class="c">
+      <xzcxlistCars carpic="../../static/img/caricon1.png" carname="阿尔法·罗密欧zz" class="car"></xzcxlistCars>
+      <xzcxlistCars carpic="../../static/img/caricon1.png" carname="阿尔法·罗密欧zz" class="car"></xzcxlistCars>
+      </view>
+      <view class="index-title">O</view>
+      <view class="c">
+       <xzcxlistCars carpic="../../static/img/caricon1.png" carname="阿尔法·罗密欧zz" class="car"></xzcxlistCars>
+      <xzcxlistCars carpic="../../static/img/caricon1.png" carname="阿尔法·罗密欧zz" class="car"></xzcxlistCars>
+      </view>
+      <view class="index-title">P</view>
+      <view class="c">
+     <xzcxlistCars carpic="../../static/img/caricon1.png" carname="阿尔法·罗密欧zz" class="car"></xzcxlistCars>
+      <xzcxlistCars carpic="../../static/img/caricon1.png" carname="阿尔法·罗密欧zz" class="car"></xzcxlistCars>
+      </view>
+      <view class="index-title">Q</view>
+      <view class="c">
+       <xzcxlistCars carpic="../../static/img/caricon1.png" carname="阿尔法·罗密欧zz" class="car"></xzcxlistCars>
+      <xzcxlistCars carpic="../../static/img/caricon1.png" carname="阿尔法·罗密欧zz" class="car"></xzcxlistCars>
+      </view>
+      <view class="index-title">R</view>
+      <view class="c">
+ <xzcxlistCars carpic="../../static/img/caricon1.png" carname="阿尔法·罗密欧zz" class="car"></xzcxlistCars>
+      <xzcxlistCars carpic="../../static/img/caricon1.png" carname="阿尔法·罗密欧zz" class="car"></xzcxlistCars>
+      </view>
+      <view class="index-title">S</view>
+      <view class="c">
+        <xzcxlistCars carpic="../../static/img/caricon1.png" carname="阿尔法·罗密欧zz" class="car"></xzcxlistCars>
+      <xzcxlistCars carpic="../../static/img/caricon1.png" carname="阿尔法·罗密欧zz" class="car"></xzcxlistCars>
+      </view>
+      <view class="index-title">T</view>
+      <view class="c">
+        <xzcxlistCars carpic="../../static/img/caricon1.png" carname="阿尔法·罗密欧zz" class="car"></xzcxlistCars>
+      <xzcxlistCars carpic="../../static/img/caricon1.png" carname="阿尔法·罗密欧zz" class="car"></xzcxlistCars>
+      </view>
+      <view class="index-title">U</view>
+      <view class="c">
+       <xzcxlistCars carpic="../../static/img/caricon1.png" carname="阿尔法·罗密欧zz" class="car"></xzcxlistCars>
+      <xzcxlistCars carpic="../../static/img/caricon1.png" carname="阿尔法·罗密欧zz" class="car"></xzcxlistCars>
+      </view>
+      <view class="index-title">V</view>
+      <view class="c">
+      <xzcxlistCars carpic="../../static/img/caricon1.png" carname="阿尔法·罗密欧zz" class="car"></xzcxlistCars>
+      <xzcxlistCars carpic="../../static/img/caricon1.png" carname="阿尔法·罗密欧zz" class="car"></xzcxlistCars>
+      </view>
+      <view class="index-title">W</view>
+      <view class="c">
+ <xzcxlistCars carpic="../../static/img/caricon1.png" carname="阿尔法·罗密欧zz" class="car"></xzcxlistCars>
+      <xzcxlistCars carpic="../../static/img/caricon1.png" carname="阿尔法·罗密欧zz" class="car"></xzcxlistCars>
+      </view>
+      <view class="index-title">X</view>
+      <view class="c">
+       <xzcxlistCars carpic="../../static/img/caricon1.png" carname="阿尔法·罗密欧zz" class="car"></xzcxlistCars>
+      <xzcxlistCars carpic="../../static/img/caricon1.png" carname="阿尔法·罗密欧zz" class="car"></xzcxlistCars>
+      </view>
+      <view class="index-title">Y</view>
+      <view class="c">
+        <xzcxlistCars carpic="../../static/img/caricon1.png" carname="阿尔法·罗密欧zz" class="car"></xzcxlistCars>
+      <xzcxlistCars carpic="../../static/img/caricon1.png" carname="阿尔法·罗密欧zz" class="car"></xzcxlistCars>
+      </view>
+      <view class="index-title">Z</view>
+      <view class="c">
+     <xzcxlistCars carpic="../../static/img/caricon1.png" carname="阿尔法·罗密欧zz" class="car"></xzcxlistCars>
+      <xzcxlistCars carpic="../../static/img/caricon1.png" carname="阿尔法·罗密欧zz" class="car"></xzcxlistCars>
+      </view>-->
+    </slot>
+
+    <view @touchmove.stop="a" @touchstart.stop="b" class="i-index-fixed">
+      <view catchtap="handlerFixedTap" v-for="(i,j) in list.list_barand" :key="j" class="i-index-fixed-item">{{i.szm}}</view>
+      <!-- <view catchtap="handlerFixedTap" class="i-index-fixed-item">B</view>
+      <view catchtap="handlerFixedTap" class="i-index-fixed-item">C</view> -->
+      <!-- <view catchtap="handlerFixedTap" class="i-index-fixed-item">B</view>
+       -->
+      <!-- <view catchtap="handlerFixedTap" class="i-index-fixed-item">D</view>
+      <view catchtap="handlerFixedTap" class="i-index-fixed-item">E</view>
+      <view catchtap="handlerFixedTap" class="i-index-fixed-item">F</view>
+      <view catchtap="handlerFixedTap" class="i-index-fixed-item">G</view>
+      <view catchtap="handlerFixedTap" class="i-index-fixed-item">H</view>
+      <view catchtap="handlerFixedTap" class="i-index-fixed-item">I</view>
+      <view catchtap="handlerFixedTap" class="i-index-fixed-item">J</view>
+      <view catchtap="handlerFixedTap" class="i-index-fixed-item">K</view>
+      <view catchtap="handlerFixedTap" class="i-index-fixed-item">L</view>
+      <view catchtap="handlerFixedTap" class="i-index-fixed-item">M</view>
+      <view catchtap="handlerFixedTap" class="i-index-fixed-item">N</view>
+      <view catchtap="handlerFixedTap" class="i-index-fixed-item">O</view>
+      <view catchtap="handlerFixedTap" class="i-index-fixed-item">P</view>
+      <view catchtap="handlerFixedTap" class="i-index-fixed-item">Q</view>
+      <view catchtap="handlerFixedTap" class="i-index-fixed-item">R</view>
+      <view catchtap="handlerFixedTap" class="i-index-fixed-item">S</view>
+      <view catchtap="handlerFixedTap" class="i-index-fixed-item">T</view>
+      <view catchtap="handlerFixedTap" class="i-index-fixed-item">U</view>
+      <view catchtap="handlerFixedTap" class="i-index-fixed-item">V</view>
+      <view catchtap="handlerFixedTap" class="i-index-fixed-item">W</view>
+      <view catchtap="handlerFixedTap" class="i-index-fixed-item">X</view>
+      <view catchtap="handlerFixedTap" class="i-index-fixed-item">Y</view>
+      <view catchtap="handlerFixedTap" class="i-index-fixed-item">Z</view> -->
+    </view>
+    <popup
+      :open="openPopup"
+      :position="position"
+      :percent="percent"
+      :background="background"
+      @close="openPopup = false"
+    >
+      <view class="xzpinpai">
+        <view class="top">
+          <img :src="popcarimg" alt class="caricon" />
+          <view class="carname">{{popcarname}}</view>
+        </view>
+        <view v-for="(item,index) in chexi" :key="index">
+          <view class="chexi">{{item.chexi_name}}</view>
+        <view v-for="(i,j) in chexi[0].chexing" :key="j" @click="tofdj(i.chexing_id,item.chexi_id)">
+          <view class="chexilist">{{i.chexing_name}}</view>
+          <view class="line"></view>
+        </view>
+        </view>
+        
+      </view>
+    </popup>
+  </view>
+</template>
+
+<script>
+import searchShuru from "../../components/search/searchShuru";
+import xzcxlistTitle from "../../components/xzcxlist/xzcxlist-title";
+import xzcxlistIcon from "../../components/xzcxlist/xzcxlist-icon";
+import xzcxlistIconList from "../../components/xzcxlist/xzcxlist-iconlist";
+import xzcxlistCars from "../../components/xzcxlist/xzcxlist-cars";
+import popup from "../../components/xzcxlist/popup";
+import { requestP } from "../../static/js/request";
+export default {
+  name: "ceshi",
+  components: {
+    searchShuru,
+    xzcxlistTitle,
+    xzcxlistIcon,
+    xzcxlistIconList,
+    xzcxlistCars,
+    popup
+  },
+  data() {
+    return {
+      dange: 0,
+      height: "",
+      top: "",
+      dange: "",
+      rect: [],
+      list: [],
+      openPopup: false,
+      position: "",
+      background: "#fff",
+      openAdPopup: false,
+      percent: 0,
+      showText: false,
+      change: false,
+      loopTimer: false,
+      sizeSort: "asc",
+      popcarname: "",
+      popcarimg: "",
+      popid: 0,
+      chexi: []
+    };
+  },
+  mounted: function() {
+    var set = setInterval(()=>{
+      if(this.height != "" && this.rect.length !=0){
+      clearInterval(set)
+
+      }
+    this.huoqu();
+
+    },200)
+    requestP({
+      url: "car/get_brand_list"
+    }).then(res => {
+      console.log(res);
+      this.list = res.data.data;
+    });
+  },
+  methods: {
+    tofdj(e,f){
+      console.log(e,f,"kjoi")
+      uni.navigateTo({
+        url:"/pages/choosefdj/choosefdj?chexingid="+e+"&popname="+this.popcarname+"&popimg="+this.popcarimg+"&pinpaiid="+this.popid+"&chexingid="+e+"&chexiid="+f
+      })
+    },
+    xuanzhong(a){
+      console.log(a)
+          this.open('right',a.brand_name,a.brand_logo,a.brand_id)
+    },
+    open: function(position, f, g, m) {
+      console.log(f, g, "ppppppppllllll");
+      this.popcarname = f;
+      this.popcarimg = g;
+      this.position = position;
+      this.openPopup = true;
+      this.popid = m;
+
+      requestP({
+        url: "car/get_brand_vehicle_list",
+        data: {
+          brand_id: m
+        }
+      }).then(res => {
+        console.log(res, 115589);
+        this.chexi = res.data.data;
+        console.log(this.chexi)
+      });
+    },
+    touchend: function() {
+      clearInterval(this.loopTimer);
+    },
+    changeBgColor: function(e) {
+      clearInterval(this.loopTimer);
+      this.loopTimer = setInterval(() => {
+        let r = Math.floor(Math.random() * 256);
+        let g = Math.floor(Math.random() * 256);
+        let b = Math.floor(Math.random() * 256);
+        let color = "#" + r.toString(16) + g.toString(16) + b.toString(16);
+        this.background = color;
+      }, 300);
+    },
+    changeSize: function() {
+      clearInterval(this.loopTimer);
+      this.loopTimer = setInterval(() => {
+        let percents = [40, 45, 50, 55, 60, 65, 70, 75, 80];
+
+        if (this.percent <= 40) this.sizeSort = "asc";
+        if (this.percent >= 80) this.sizeSort = "desc";
+        if (this.sizeSort == "desc") percents = percents.reverse();
+
+        for (let i = 0; i <= percents.length; i++) {
+          if (this.sizeSort == "desc") {
+            if (this.percent > percents[i]) {
+              this.percent = percents[i];
+              break;
+            }
+          } else {
+            if (this.percent < percents[i]) {
+              this.percent = percents[i];
+              break;
+            }
+          }
+        }
+      }, 200);
+    },
+    reset: function() {
+      this.percent = 0;
+      this.background = "#fff";
+      this.showText = false;
+    },
+    //上面的是弹出层的
+
+    a: function(a) {
+      console.log(a);
+      this.jisuan(a.touches[0].clientY - this.top);
+    },
+    b: function(a) {
+      console.log(a);
+      this.jisuan(a.touches[0].clientY - this.top);
+    },
+    huoqu() {
+      var query = uni.createSelectorQuery().in(this);
+      //选择id
+      var that = this;
+      query
+        .select(".i-index-fixed")
+        .boundingClientRect(rect => {
+          console.log(rect, 1);
+          if (rect == null) {
+            this.$nextTick(() => {
+              this.huoqu();
+            });
+          }
+
+          var dan = Math.floor(rect.height / that.list.list_barand.length);
+          console.log(dan, 123);
+
+          (that.height = rect.height), console.log(that.height);
+          (that.top = Math.floor(rect.top) - 6), (that.dange = dan);
+        })
+        .exec();
+      query
+        .selectAll(".index-title")
+        .boundingClientRect(rect => {
+          console.log(rect, 1);
+          this.rect = rect;
+        })
+        .exec();
+      // i-index-line
+    },
+    // c: function (a) {
+    //   console.log(a);
+    //   this.jisuan(a.target.offsetTop)
+    // },
+    jisuan: function(a) {
+      var c = Math.floor(a / this.dange);
+      // console.log(c)
+      // console.log(Math.floor(a / this.data.dange))
+      var z = "";
+      // switch (c) {
+      //   case 1:
+      //     z = "A";
+      //     break;
+      //   case 2:
+      //     z = "B";
+      //     break;
+      //   case 3:
+      //     z = "C";
+      //     break;
+      //   case 4:
+      //     z = "D";
+      //     break;
+      //   case 5:
+      //     z = "E";
+      //     break;
+      //   case 6:
+      //     z = "F";
+      //     break;
+      //   case 7:
+      //     z = "G";
+      //     break;
+      //   case 8:
+      //     z = "H";
+      //     break;
+      //   case 9:
+      //     z = "I";
+      //     break;
+      //   case 10:
+      //     z = "J";
+      //     break;
+      //   case 11:
+      //     z = "K";
+      //     break;
+      //   case 12:
+      //     z = "L";
+      //     break;
+      //   case 13:
+      //     z = "M";
+      //     break;
+      //   case 14:
+      //     z = "N";
+      //     break;
+      //   case 15:
+      //     z = "O";
+      //     break;
+      //   case 16:
+      //     z = "P";
+      //     break;
+      //   case 17:
+      //     z = "Q";
+      //     break;
+      //   case 18:
+      //     z = "R";
+      //     break;
+      //   case 19:
+      //     z = "S";
+      //     break;
+      //   case 20:
+      //     z = "T";
+      //     break;
+      //   case 21:
+      //     z = "U";
+      //     break;
+      //   case 22:
+      //     z = "V";
+      //     break;
+      //   case 23:
+      //     z = "W";
+      //     break;
+      //   case 24:
+      //     z = "X";
+      //     break;
+      //   case 25:
+      //     z = "Y";
+      //     break;
+      //   case 26:
+      //     z = "Z";
+      //     break;
+      // }
+      z= this.list.list_barand[c].szm
+      var that = this;
+      console.log(that.rect)
+      uni.pageScrollTo({
+        duration: 0,
+        scrollTop: that.rect[c].top
+      });
+
+      console.log(z);
+      if (z) {
+        wx.showToast({
+          title: z,
+
+          icon: "none",
+
+          duration: 2000 //持续的时间
+        });
+      }
+    }
+  }
+};
+</script>
+
+<style lang="scss">
+.serch {
+  position: relative;
+  top: 17upx;
+}
+.i-index {
+  width: 100%;
+  height: 100%;
+}
+
+.i-index-line {
+  width: 80%;
+  height: 2rpx;
+  background-color: #f7f7f7;
+  float: right;
+}
+
+.i-index-content {
+  background: #fff;
+  position: relative;
+  z-index: 1;
+  display: inline-block;
+  padding: 0 20rpx;
+}
+
+.i-index-fixed {
+  position: fixed;
+  right: 0;
+  top: 50%;
+  z-index: 10;
+  padding-left: 20rpx;
+  transform: translateY(-50%);
+}
+
+.i-index-fixed-item {
+  display: block;
+  height: 36rpx;
+  line-height: 36rpx;
+  padding: 0 10rpx;
+  text-align: center;
+  color: #595959;
+  font-size: 24rpx;
+  border-radius: 50%;
+}
+
+.i-index-fixed-item-current {
+  background: #2d8cf0;
+  color: #fff;
+}
+
+.i-index-tooltip {
+  position: fixed;
+  left: 50%;
+  top: 50%;
+  transform: translate3d(-50%, -50%, 0);
+  background: rgba(0, 0, 0, 0.7);
+  color: #fff;
+  font-size: 48rpx;
+  border-radius: 50%;
+  width: 160rpx;
+  height: 160rpx;
+  line-height: 160rpx;
+  text-align: center;
+}
+
+.local-position-content {
+  height: 160rpx;
+  padding-left: 40rpx;
+  display: flex;
+  align-items: center;
+  color: #999;
+  background: #fff;
+  font-size: 24rpx;
+}
+
+.local-position-content span {
+  font-size: 40rpx;
+  font-weight: bold;
+  color: #ff5344;
+  margin-right: 8rpx;
+}
+
+.index-title {
+  height: 70rpx;
+  line-height: 70rpx;
+  font-size: 26rpx;
+  padding-left: 40rpx;
+  color: #999;
+  background: #f6f6f6;
+  position: relative;
+  top: 32upx;
+}
+.c {
+  background: #fff;
+  width: 100%;
+  /* height: 140rpx; */
+  font-size: 32rpx;
+  /* padding-left: 40rpx; */
+  position: relative;
+  top: 44upx;
+}
+.c span {
+  width: 100%;
+  height: 70rpx;
+  line-height: 70rpx;
+}
+.b {
+  display: block;
+}
+.router-hover {
+  opacity: 1;
+}
+
+.box {
+  width: 750upx;
+  height: 100%;
+  background-color: rgba(126, 126, 126, 0.8);
+  position: absolute;
+  top: 0;
+}
+.xzpinpai {
+  width: 618upx;
+  height: 100%;
+  background-color: white;
+  // position: absolute;
+  // top: 0;
+  // right: 0;
+  // z-index: 9999;
+  .top {
+    height: 93upx;
+    display: flex;
+    .caricon {
+      width: 92upx;
+      height: 53upx;
+      margin-top: 20upx;
+      margin-left: 11upx;
+    }
+    .carname {
+      color: #1d1d1d;
+      font-size: 28upx;
+      margin-top: 25rpx;
+      margin-left: 10px;
+    }
+  }
+  .chexi {
+    height: 59upx;
+    width: 100%;
+    background-color: #f0efed;
+    line-height: 59upx;
+    text-indent: 30upx;
+    color: #666666;
+    font-size: 22upx;
+  }
+  .chexilist {
+    height: 85upx;
+    width: 100%;
+    text-indent: 29upx;
+    line-height: 85upx;
+    color: #3C3A3C;
+    font-size: 26upx;
+  }
+  .line {
+    width: 590upx;
+    height: 2upx;
+    background-color: #d9d9d9;
+    margin-left: 28upx;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/components/changecar/changecar-car.vue b/src/components/changecar/changecar-car.vue
new file mode 100644
index 0000000..5e6aa6c
--- /dev/null
+++ b/src/components/changecar/changecar-car.vue
@@ -0,0 +1,89 @@
+<template>
+  <view class="changecarCar">
+    <view class="cardetail">
+      <img src="../../static/img/caricon1.png" alt class="caricon" />
+      <view class="carinfo">
+        <view>阿尔法·罗密欧-Stelvio</view>
+        <view class="cardesc">2019款2.9T 手自一体 510HPF1限量款</view>
+      </view>
+    </view>
+    <view>
+      <img src="../../static/img/selected.png"  :data-k="current" class="xz1" v-if="ifxz" @click="xz">
+      <img src="../../static/img/select.png" :data-k="current" class="xz" v-else @click="xz"/>
+       
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  name: "changecarCar",
+  data() {
+    return {
+      ifxz: false
+    };
+  },
+  props: {
+    val: {
+      type: String
+    },
+    index: {
+      type: Number
+    },
+    current: {
+      type: Number,
+      value: 0
+    },
+    ids: {
+      type: Array
+    }
+  },
+  methods: {
+    xz(){
+      console.log(80)
+      this.$emit('select');
+    }
+  }
+};
+</script>
+
+<style lang="scss">
+.changecarCar {
+  height: 105upx;
+  border: 1upx solid gray;
+  display: flex;
+  justify-content: space-between;
+  .cardetail {
+    display: flex;
+    margin: auto 0;
+    .caricon {
+      width: 82upx;
+      height: 82upx;
+    }
+    .carinfo {
+      width: 394upx;
+      height: 59upx;
+      margin-left: 33upx;
+      font-size: 24upx;
+      color: #222222;
+      .cardesc {
+        color: #999999;
+        font-size: 22upx;
+        margin-top: 15upx;
+      }
+    }
+  }
+  .xz{
+    width:50upx;
+    height: 50upx;
+   margin-top: 25upx;
+   margin-right: 24upx;
+  }
+    .xz1{
+    width:50upx;
+    height: 50upx;
+   margin-top: 25upx;
+   margin-right: 24upx;
+  }  
+}
+</style>
\ No newline at end of file
diff --git a/src/components/chooseaddr/chooseaddr-btn.vue b/src/components/chooseaddr/chooseaddr-btn.vue
new file mode 100644
index 0000000..0b41a5d
--- /dev/null
+++ b/src/components/chooseaddr/chooseaddr-btn.vue
@@ -0,0 +1,22 @@
+<template>
+    <view class="chooseaddrBtn">
+        一键获取微信地址
+    </view>
+</template>
+<script>
+export default {
+    name:'chooseaddrBtn'
+}
+</script>
+<style lang="scss">
+.chooseaddrBtn{
+    width: 690upx;
+    height: 82upx;
+    text-align: center;
+    line-height: 82upx;
+    color: white;
+    font-size: 30upx;
+    background-color: #DF3348;
+
+}
+</style>
\ No newline at end of file
diff --git a/src/components/chooseaddr/chooseaddr-btn1.vue b/src/components/chooseaddr/chooseaddr-btn1.vue
new file mode 100644
index 0000000..98f62e8
--- /dev/null
+++ b/src/components/chooseaddr/chooseaddr-btn1.vue
@@ -0,0 +1,42 @@
+<template>
+  <view class="chooseaddrBtn1" @click="sub">
+      <img src="../../static/img/addr-add.png" alt="" class="add" v-if="ifadd">
+    <text>添加联系人信息</text>
+  </view>
+</template>
+<script>
+export default {
+  name: "chooseaddrBtn1",
+  props:{
+    ifadd:{
+      type:Boolean
+    }
+  },
+  methods:{
+    sub(){
+      this.$emit("sub",true)
+    }
+  }
+  
+};  
+// 判断是否有加号图片
+</script>
+<style lang="scss" scoped>
+.chooseaddrBtn1 {
+  width: 690upx;
+  height: 82upx;
+  text-align: center;
+  line-height: 82upx;
+  font-size: 30upx;
+  border: 2px solid rgba(223, 51, 72, 1);
+  color: #df3348;
+  display: flex;
+  justify-content: center;
+  .add{
+      width: 26upx;
+      height: 26upx;
+      margin: auto 0;
+      margin-right: 12upx;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/components/chooseaddr/chooseaddr-info.vue b/src/components/chooseaddr/chooseaddr-info.vue
new file mode 100644
index 0000000..3e5596f
--- /dev/null
+++ b/src/components/chooseaddr/chooseaddr-info.vue
@@ -0,0 +1,82 @@
+<template>
+  <view>
+    <view class="chooseaddr">
+      <view class="userinfo">
+        <view class="info">
+          <view>{{name}}</view>
+          <view class="info1">
+            <view class="tel">{{phone}}</view>
+            <view class="mr" v-if="defined">默认</view>
+          </view>
+        </view>
+        <view>{{address}}</view>
+      </view>
+      <view>
+        <img src="../../static/img/edit.png" @click.stop="modify" alt class="edit" />
+      </view>
+      
+    </view>
+    <img src="../../static/img/border.png" alt class="line" />
+  </view>
+</template>
+<script>
+export default {
+  name: "chooseaddrInfo",
+  props:["name","phone","defined","address","aid"],
+  methods:{
+    modify(){
+      console.log(this.aid)
+      this.$emit("addid")
+    }
+  }
+};
+</script>
+<style lang="scss">
+.chooseaddr {
+  height: 182upx;
+  width: 100%;
+  display: flex;
+  justify-content: space-between;
+  .userinfo {
+    // width: 449upx;
+    height: 97upx;
+    font-size: 27upx;
+    padding-left: 31upx;
+    .info {
+      width: 500upx;
+      display: flex;
+      //   justify-content: space-around;
+      margin-top: 44upx;
+      margin-bottom: 41upx;
+      .info1 {
+        display: flex;
+        .tel {
+          margin-right: 20upx;
+          margin-left:107upx;
+        }
+        .mr {
+          width: 84upx;
+          height: 41upx;
+          background: rgba(239, 98, 116, 1);
+          border: 2upx solid rgba(223, 51, 72, 1);
+          border-radius: 21upx;
+          color: white;
+          text-align: center;
+          line-height: 41upx;
+        }
+      }
+    }
+  }
+  .edit {
+    width: 33upx;
+    height: 34upx;
+    margin-top: 47upx;
+    margin-right: 25upx;
+  }
+
+}
+  .line {
+    height: 9upx;
+    width: 100%;
+  }
+</style>
\ No newline at end of file
diff --git a/src/components/choosebaoyang/choosebaoyang-bottom.vue b/src/components/choosebaoyang/choosebaoyang-bottom.vue
new file mode 100644
index 0000000..96950c3
--- /dev/null
+++ b/src/components/choosebaoyang/choosebaoyang-bottom.vue
@@ -0,0 +1,79 @@
+<template>
+  <view class="choosebaoyangBottom">
+    <view class="left">
+      <img src="../../static/img/serve.png" alt class="serve" />
+      <view class="desc">在线客服</view>
+    </view>
+    <view class="center">
+      <view class="pri">总价：<text class="money">￥{{price}}</text ></view>
+      <!-- <view class="zhushi">不包含安装费</view> -->
+    </view>
+    <view class="btn" @click="jiesuan">添加购物车</view>
+  </view>
+</template>
+
+<script>
+export default {
+  name: "choosebaoyangBottom",
+  props:{
+      price:{
+          type: Number
+      }
+  },
+  methods:{
+      jiesuan(){
+    this.$emit("jiesuan",true)
+  }
+  }
+
+};
+//price  总价
+</script>
+
+<style lang="scss">
+.choosebaoyangBottom {
+  height: 121upx;
+  background-color: white;
+  display: flex;
+  justify-content: space-between;
+  .left {
+    width: 82upx;
+    height: 63upx;
+    margin: auto 0;
+    margin-left: 24upx;
+    .serve {
+      width: 38upx;
+      height: 40upx;
+      margin-left: 21upx;
+    }
+    .desc {
+      color: #666666;
+      font-size: 20upx;
+    }
+  }
+  .center{
+      // width: 145upx;
+      color: #666666;
+      font-size: 23upx;
+      margin: auto 0;
+        .pri{
+            .money{
+                color: #DF3348;
+            }
+            .zhushi{
+                text-align: center;
+            }
+        }
+  }
+  .btn{
+      width: 279upx;
+      height: 83upx;
+      color: white;
+      background-color: #DF3348;
+      text-align:center;
+      line-height: 83upx;
+      margin: auto 0;
+      margin-right: 30upx;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/components/choosebaoyang/choosebaoyang-servedetail.vue b/src/components/choosebaoyang/choosebaoyang-servedetail.vue
new file mode 100644
index 0000000..0901428
--- /dev/null
+++ b/src/components/choosebaoyang/choosebaoyang-servedetail.vue
@@ -0,0 +1,22 @@
+<template>
+  <view class="choosebaoyangServedetail">
+      小保养服务暂时缺货，紧急补货中... 
+  </view>
+</template>
+
+<script>
+export default {
+name:'choosebaoyangServedetail'
+}
+</script>
+
+<style lang="scss">
+.choosebaoyangServedetail{
+    height: 77upx;
+    line-height: 77upx;
+    color:#999999;
+    font-size: 22upx;
+    text-align: center;
+    background-color: white;
+}
+</style>
\ No newline at end of file
diff --git a/src/components/choosebaoyang/choosebaoyang-service.vue b/src/components/choosebaoyang/choosebaoyang-service.vue
new file mode 100644
index 0000000..7e91864
--- /dev/null
+++ b/src/components/choosebaoyang/choosebaoyang-service.vue
@@ -0,0 +1,91 @@
+<template>
+  <view class="choosebaoyangService">
+      <view class="left">
+          <img src="../../static/img/selected.png" alt=""  class="xz" v-if="ifxz"> 
+           <img src="../../static/img/select.png" alt=""  class="xz" v-else> 
+          <view class="service">
+              <view class="name">{{serveName}}</view>
+              <view class="desc">{{serveDesc}}</view>
+          </view>
+      </view>
+      <view class="right">
+          <text class="pri" v-if="yh">优惠券</text>
+           <text class="qian" v-else>
+               <text class="icon">￥</text>
+               <text class="money">{{pri}}</text>
+               </text>
+      </view>
+  </view>
+</template>
+
+<script>
+export default {
+    name:'choosebaoyangService',
+    props:{
+        yh:{
+            type:Boolean,
+            value:false
+        },
+        ifxz:{
+            type:Boolean,
+            value:false
+        },
+        pri:{
+            type:Number
+        },
+        serveName:{
+            type:String
+        },
+        serveDesc:{
+            type:String
+        }
+    }
+}
+// youhui  是否有优惠那行  ifxz: 单选框是否有选中  pri  价格   servename  服务名称  servedesc  服务详情介绍
+</script>
+
+<style lang="scss">
+.choosebaoyangService{
+    height: 110upx;
+    background-color: white;
+    display: flex;
+    justify-content: space-between;
+    .left{
+        display: flex;
+        margin:auto 0;
+        margin-left: 30upx;
+        .xz{
+            width: 42upx;
+            height: 42upx;
+            margin: auto 0;
+            margin-right: 20upx;
+        }
+        .service{
+            font-size: 27upx;
+            color: #333333;
+            .desc{
+                font-size: 22upx;
+                color:#999999;
+            }
+        }
+
+    }
+            .pri{
+        color:#EC6515;
+        font-size: 22upx;
+        line-height: 75upx;
+        margin-right: 32upx;
+    }
+      .qian{
+            font-size: 29upx;
+            color: #999999;
+            line-height:75upx;
+            margin-right: 34upx;
+            .icon{
+                    font-size:21upx;
+            }
+        }
+
+
+}
+</style>
\ No newline at end of file
diff --git a/src/components/choosebaoyang/choosebaoyang-title.vue b/src/components/choosebaoyang/choosebaoyang-title.vue
new file mode 100644
index 0000000..155c124
--- /dev/null
+++ b/src/components/choosebaoyang/choosebaoyang-title.vue
@@ -0,0 +1,28 @@
+<template>
+  <view class="choosebaoyangTitle">
+        {{title0}}
+  </view>
+</template>
+
+<script>
+export default {
+    name:'choosebaoyangTitle',
+    props:{
+      title0:{
+        type:String
+      }
+    }
+}
+// title0  灰色条的字
+</script>
+
+<style lang="scss">
+.choosebaoyangTitle{
+    height: 63upx;
+    background-color: #EEEEEE;
+    color: #999999;
+    font-size: 21upx;
+    text-align: center;
+    line-height: 63upx;    
+}
+</style>
\ No newline at end of file
diff --git a/src/components/choosebaoyang/choosebaoyang-top.vue b/src/components/choosebaoyang/choosebaoyang-top.vue
new file mode 100644
index 0000000..92d06a3
--- /dev/null
+++ b/src/components/choosebaoyang/choosebaoyang-top.vue
@@ -0,0 +1,82 @@
+<template>
+  <view class="choosebaoyangTop">
+    <picker @change="bindPickerChange" :value="index" :range="carname">
+      <text>{{carname[index]}}</text>
+      <img src="../../static/img/arrowdown.png" alt class="arrow" />
+    </picker>
+    <view class="line"></view>
+    <view class="right">
+      <text>当前里程：</text>
+      <input type="text" @change="input" class="licheng" placeholder="请输入" />
+      <text>KM</text>
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  name: "choosebaoyangTop",
+  props: {
+    carlist: {
+      type: Array
+    }
+  },
+  data() {
+    return {
+      index: 0,
+      carname:[]
+    };
+  },
+  watch: {
+    carlist() {
+      for (let i = 0; i < this.carlist.length; i++) {
+        this.$set(this.carname,i,this.carlist[i].car_name)
+
+      }
+    }
+  },
+  methods: {
+    bindPickerChange(e) {
+      console.log(e);
+      this.index = e.target.value;
+      this.$emit("cheming", this.carlist[e.target.value].car_id);
+    },
+    input(a) {
+      this.$emit("input", a.detail.value);
+    }
+  }
+};
+</script>
+
+<style lang="scss">
+.choosebaoyangTop {
+  height: 63upx;
+  background-color: white;
+  display: flex;
+  justify-content: center;
+  font-size: 21upx;
+  color: #222222;
+  line-height: 63upx;
+  .line {
+    width: 2upx;
+    height: 42upx;
+    background-color: #d9d9d9;
+    margin: auto 0;
+    margin-left: 61upx;
+    margin-right: 76upx;
+  }
+  .arrow {
+    width: 21upx;
+    height: 12upx;
+    margin-left: 40upx;
+  }
+  .right {
+    display: flex;
+    .licheng {
+      width: 79upx;
+      font-size: 22upx;
+      margin-top: 6upx;
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/components/choosesize/choosesize-cardesc.vue b/src/components/choosesize/choosesize-cardesc.vue
new file mode 100644
index 0000000..b2b1b3a
--- /dev/null
+++ b/src/components/choosesize/choosesize-cardesc.vue
@@ -0,0 +1,91 @@
+<template>
+  <view class="choosesizeCardesc">
+    <view class="desc">
+      <view class="problem">
+        <view class="desc1">
+          <view class="icon">问</view>
+          <text class="zi">{{problem}}</text>
+        </view>
+        <view class="desc1 answer">
+          <view class="icon icon1">答</view>
+          <text class="zi">{{answer}}</text>
+        </view>
+      </view>
+
+      <view class="line"></view>
+      <img  :src="shoppic" alt class="shop" />
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+    name:'choosesizeCardesc',
+    props:{
+        problem:{
+            type:String
+        },
+        answer:{
+            type:String
+        },
+        shoppic:{
+            type:String
+        }
+    }
+};
+// problem 问题  answer 答案  shoppic  商品图片 
+</script>
+
+<style lang="scss">
+.choosesizeCardesc {
+  width: 706upx;
+  height: 787upx;
+  background-color: white;
+  .desc {
+    width: 659upx;
+    height: 112upx;
+    margin: 0 auto;
+    .problem {
+      padding-top: 41upx;
+      .desc1 {
+        height: 29upx;
+        display: flex;
+        line-height: 29upx;
+        .icon {
+          width: 29upx;
+          height: 29upx;
+          background-color: #c7513f;
+          color: white;
+          font-size: 21upx;
+          text-align: center;
+        }
+        .zi {
+          color: #5c5c5c;
+          font-size: 24upx;
+          margin-left: 9upx;
+        }
+        .icon1 {
+          background-color: #4bb20c;
+        }
+      }
+    }
+
+    .answer {
+      margin-top: 24upx;
+      margin-bottom: 32upx;
+    }
+    .line {
+      width: 657upx;
+      height: 1upx;
+      background-color: #dadada;
+      margin-bottom: 16upx;
+    }
+    .shop {
+      width: 632upx;
+      height: 562upx;
+      margin: 0 auto;
+      margin-bottom: 23upx;
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/components/choosesize/choosesize-carinfo.vue b/src/components/choosesize/choosesize-carinfo.vue
new file mode 100644
index 0000000..f77e4c5
--- /dev/null
+++ b/src/components/choosesize/choosesize-carinfo.vue
@@ -0,0 +1,52 @@
+<template>
+  <view class="choosesizeCarinfo">
+    <view class="carinfo">
+      <img src="../../static/img/cariconwhite.png" alt class="icon" />
+      <text class="carname">江淮安驰-小公主</text>
+    </view>
+    <view class="btns">
+      <view class="btn">145/70R12</view>
+    </view>
+  </view>
+</template>
+        
+<script>
+export default {
+  name: "choosesizeCarinfo"
+};
+</script>
+
+<style lang="scss">
+.choosesizeCarinfo {
+  background-color: white;
+  padding-bottom: 31upx;
+  .carinfo {
+    padding-top: 26upx;
+    padding-left: 20upx;
+    .icon {
+      width: 83upx;
+      height: 47upx;
+      margin: auto 0;
+    }
+    .carname {
+      color: #222222;
+      font-size: 26upx;
+      position: relative;
+      bottom: 10upx;
+    }
+  }
+  .btns {
+      margin-top:36upx;
+      margin-bottom: 31upx;
+    .btn {
+      width: 693upx;
+      height: 84upx;
+      border: 2upx solid #dcdcdc;
+      color: #333333;
+      font-size: 21upx;
+      text-align: center;
+      line-height: 84upx;
+      margin: 0 auto;    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/components/choosesize/choosesize-chexing.vue b/src/components/choosesize/choosesize-chexing.vue
new file mode 100644
index 0000000..9171f3b
--- /dev/null
+++ b/src/components/choosesize/choosesize-chexing.vue
@@ -0,0 +1,29 @@
+<template>
+<view class="choosesizeChexing">
+<choosesizeCarinfo></choosesizeCarinfo>
+<view class="choosesizeCardesc">
+<choosesizeCardesc problem="如何知道轮胎规格？" answer="在轮胎的胎侧都摹刻了轮胎的规格，下图中225/450" shoppic="../../static/img/choosesizecarpic.png"></choosesizeCardesc>
+</view>
+
+</view>
+</template>
+
+<script>
+import choosesizeCarinfo  from "../../components/choosesize/choosesize-carinfo"
+import choosesizeCardesc from "../../components/choosesize/choosesize-cardesc"
+export default {
+name:'choosesizeChexing',
+components:{
+choosesizeCarinfo,
+choosesizeCardesc
+}
+}
+</script>
+
+<style lang="scss">
+.choosesizeCardesc{
+    display: flex;
+    justify-content: center;
+    margin-top: 22upx;
+}
+</style>
\ No newline at end of file
diff --git a/src/components/choosesize/choosesize-mid.vue b/src/components/choosesize/choosesize-mid.vue
new file mode 100644
index 0000000..420a3cd
--- /dev/null
+++ b/src/components/choosesize/choosesize-mid.vue
@@ -0,0 +1,59 @@
+<template>
+<view >
+      <view class="choosesizeMid">
+      <img src="../../static/img/choosesize.png" alt=""  class="pic">
+        <view class="desc">
+            <view class="attr">
+                <text>轮胎宽</text>
+                <text class="line">/</text>
+            </view>
+          <view class="attr">
+                <text>轮胎宽</text>
+                <text class="line">/</text>
+            </view>
+               <view class="attr">
+                <text>轮胎宽</text>
+                <text class="line">/</text>
+            </view>
+        </view>
+  </view>
+</view>
+
+</template>
+
+<script>
+export default {
+name:'choosesizeMid',
+props:{
+    type:{
+        type:Number
+    }
+}
+}
+</script>
+
+<style lang="scss">
+.choosesizeMid{
+    background-color: white;
+    .pic{
+        width: 750upx;
+        height: 225upx;
+    }
+    .desc{
+        height: 28upx;
+        display: flex;
+        justify-content: space-around;
+        .attr{
+            font-size: 30upx;
+            color:#000000;
+            text-align: center;
+            margin-left: 60upx;
+        }
+        .line{
+            margin-left: 72upx;
+            color: #858282;
+            font-size: 30upx
+        }
+    }
+}
+</style>
\ No newline at end of file
diff --git a/src/components/choosesize/choosesize-search.vue b/src/components/choosesize/choosesize-search.vue
new file mode 100644
index 0000000..b35cb68
--- /dev/null
+++ b/src/components/choosesize/choosesize-search.vue
@@ -0,0 +1,40 @@
+<template>
+  <view class="choosesizeSearch">
+      <input type="text" class="shuru" placeholder="轮胎宽/扁平比R直径">
+      <view class="btn">查找</view>
+  </view> 
+</template>
+
+<script>
+export default {
+name:'choosesizeSearch'
+}
+</script>
+
+<style lang="scss">
+.choosesizeSearch{
+    height: 117upx;
+    background-color: white;
+    display: flex;
+    padding-bottom: 59upx;
+    .shuru{
+        width: 524upx;
+        height: 78upx;
+         border: 2upx solid #E5E5E5; 
+         font-size: 26upx;
+         margin: auto 0;
+         margin-left:28upx;
+    }
+    .btn{
+        width: 146upx;
+        height: 78upx;
+        background-color:#E03548;
+        color: white;
+        font-size: 26upx;
+        text-align: center;
+        line-height: 78upx;
+        margin: auto 0;
+        margin-left: 23upx;
+    }
+}
+</style>
\ No newline at end of file
diff --git a/src/components/choosesize/choosesize-top.vue b/src/components/choosesize/choosesize-top.vue
new file mode 100644
index 0000000..d62d257
--- /dev/null
+++ b/src/components/choosesize/choosesize-top.vue
@@ -0,0 +1,51 @@
+<template>
+  <view class="choosesizeTop">
+      <view :class="select[0]" @click="choose" data-type="1">车型适配</view>
+      <view :class="select[1]" @click="choose" data-type="2">自选规格</view>
+  </view>
+</template>
+
+<script>
+export default {
+name:"choosesizeTop",
+data(){
+    return {
+        select:['select','selected'],
+        leixing:2
+    }
+},
+methods:{
+    choose(e){
+        this.leixing=e.currentTarget.dataset.type
+        if(this.leixing==1){
+            this.select=['selected','select']
+        }else{
+            this.select=['select','selected']
+        }
+         this.$emit('changes',this.leixing);
+    }
+}
+}
+</script>
+
+<style lang="scss">
+.choosesizeTop{
+    height: 78upx;
+    background-color: white;
+    border-bottom: 2upx solid #EEEEEE;
+    display: flex;
+      
+        font-size:  26upx;
+        text-align: center;
+        line-height: 78upx;
+    .select{
+        width: 380upx;
+      color: #666666;
+    }
+        .selected{
+        width: 370upx;
+      color:#E68645;
+      border-bottom: 2upx solid #E68645
+    }
+}
+</style>
\ No newline at end of file
diff --git a/src/components/index/index-ad.vue b/src/components/index/index-ad.vue
new file mode 100644
index 0000000..6954cd6
--- /dev/null
+++ b/src/components/index/index-ad.vue
@@ -0,0 +1,28 @@
+<template>
+    <view class="ad">
+        <img :src="ad" alt="" class="adpic">
+    </view>
+</template>
+<script>
+export default {
+    name:"indexAd",
+    props:{
+        ad:{
+            type:String
+        }
+    },
+    mounted(){
+        console.log(this.ad,44455)
+    }
+}
+</script>
+<style lang="scss" scoped>
+.ad{
+    height: 236upx;
+    width: 100%;
+    .adpic{
+        width: 744upx;
+        height: 234upx;
+    }
+}
+</style>
\ No newline at end of file
diff --git a/src/components/index/index-addcar.vue b/src/components/index/index-addcar.vue
new file mode 100644
index 0000000..741bf61
--- /dev/null
+++ b/src/components/index/index-addcar.vue
@@ -0,0 +1,44 @@
+<template>
+  <view class="addcar">
+    <view class="adds">
+      <view class="a">
+        <img src="../../static/img/add.png" alt class="add" />
+        <text class="cliadd">点击添加车辆</text>
+      </view>
+    </view>
+  </view>
+</template>
+<script>
+export default {
+  name: "indexAddcar",
+};
+</script>
+<style lang="scss">
+.addcar {
+  width: 720upx;
+  height: 92upx;
+  background: rgba(222, 53, 72, 1);
+  box-shadow: 0px 0px 13upx 1upx rgba(49, 49, 49, 0.13);
+  border-radius: 10px;
+  .adds {
+    width: 229upx;
+    height: 92upx;
+    margin: 0 auto;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    .add {
+      width: 30upx;
+      height: 30upx;
+      margin: auto 0;
+      margin-right: 14upx;  
+    }
+    .cliadd {
+      font-size: 30upx;
+      color: white;
+      position: relative;
+      bottom: 5upx;
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/components/index/index-icon.vue b/src/components/index/index-icon.vue
new file mode 100644
index 0000000..41058c3
--- /dev/null
+++ b/src/components/index/index-icon.vue
@@ -0,0 +1,222 @@
+<template>
+  <view>
+    <view class="indexicon" v-if="choosecolor==1">
+      <view>
+        <view class="icon">
+          <img :src="imgurl" alt class="iconpic" />
+        </view>
+        <view class="desc">{{desc}}</view>
+      </view>
+    </view>
+    <view class="indexicon" v-if="choosecolor==2">
+      <view>
+        <view class="icon1">
+          <img :src="imgurl" alt class="iconpic" />
+        </view>
+        <view class="desc">{{desc}}</view>
+      </view>
+    </view>
+       <view class="indexicon" v-if="choosecolor==3">
+      <view>
+        <view class="icon2">
+          <img :src="imgurl" alt class="iconpic" />
+        </view>
+        <view class="desc">{{desc}}</view>
+      </view>
+    </view>
+       <view class="indexicon" v-if="choosecolor==4">
+      <view>
+        <view class="icon3">
+          <img :src="imgurl" alt class="iconpic" />
+        </view>
+        <view class="desc">{{desc}}</view>
+      </view>
+    </view>
+       <view class="indexicon" v-if="choosecolor==5">
+      <view>
+        <view class="icon4">
+          <img :src="imgurl" alt class="iconpic" />
+        </view>
+        <view class="desc">{{desc}}</view>
+      </view>
+    </view>
+       <view class="indexicon" v-if="choosecolor==6">
+      <view>
+        <view class="icon5">
+          <img :src="imgurl" alt class="iconpic" />
+        </view>
+        <view class="desc">{{desc}}</view>
+      </view>
+    </view>
+       <view class="indexicon" v-if="choosecolor==7">
+      <view>
+        <view class="icon6">
+          <img :src="imgurl" alt class="iconpic" />
+        </view>
+        <view class="desc">{{desc}}</view>
+      </view>
+    </view>
+  </view>
+  <!-- choosecolor:1 蓝色,  choosecolor:2黄色, choosecolor:3 绿色, choosecolor:4  蓝色1  choosecolor:5 粉色  choosecolor:6 红色 ， choosecolor:7 灰色-->
+</template>
+<script>
+export default {
+  name: "indexIcon",
+  data() {
+    return {
+      blue1: "icon",
+      gold: "icon1",
+      green: "icon2",
+      blue2: "icon3",
+      pink: "icon4",
+      red: "icon5",
+      gray: "icon6"
+    };
+  },
+  props: {
+    imgurl: {
+      type: String
+    },
+    desc: {
+      type: String
+    },
+    choosecolor: {
+      // type: Number
+    }
+  }
+};
+// imgurl 图片地址  desc 图标功能如：发动机维护      choosecolor 图标的背景色
+</script>
+<style lang="scss">
+.indexicon {
+  width: 123upx;
+  height: 124upx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  flex-direction: column;
+  .icon {
+    width: 80upx;
+    height: 80upx;
+    background: linear-gradient(
+      0deg,
+      rgba(88, 152, 255, 1),
+      rgba(124, 213, 248, 1)
+    );
+    border-radius: 50%;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    margin: 0 auto;
+    margin-bottom: 21upx;
+  }
+  .icon1 {
+    width: 80upx;
+    height: 80upx;
+    background: linear-gradient(
+      180deg,
+      rgba(254, 217, 132, 1),
+      rgba(255, 152, 87, 1)
+    );
+    border-radius: 50%;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    margin: 0 auto;
+    margin-bottom: 21upx;
+
+  }
+  .icon2 {
+    width: 80upx;
+    height: 80upx;
+    background: linear-gradient(
+      0deg,
+      rgba(71, 196, 120, 1),
+      rgba(154, 239, 227, 1)
+    );
+    border-radius: 50%;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    margin: 0 auto;
+    margin-bottom: 21upx;
+
+  }
+  .icon3 {
+    width: 80upx;
+    height: 80upx;
+    background: linear-gradient(
+      180deg,
+      rgba(112, 212, 255, 1),
+      rgba(41, 155, 251, 1)
+    );
+    border-radius: 50%;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    margin: 0 auto;
+    margin-bottom: 21upx;
+
+  }
+  .icon4 {
+    width: 80upx;
+    height: 80upx;
+    background: linear-gradient(
+      180deg,
+      rgba(255, 132, 164, 1),
+      rgba(253, 38, 108, 1)
+    );
+    border-radius: 50%;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    margin: 0 auto;
+    margin-bottom: 21upx;
+
+  }
+  .icon5 {
+    width: 80upx;
+    height: 80upx;
+    background: linear-gradient(
+      0deg,
+      rgba(234, 64, 61, 1),
+      rgba(251, 138, 115, 1)
+    );
+    border-radius: 50%;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    margin: 0 auto;
+    margin-bottom: 21upx;
+
+  }
+  .icon6 {
+    width: 80upx;
+    height: 80upx;
+    background: linear-gradient(
+      60deg,
+      rgba(201, 199, 202, 1),
+      rgba(139, 137, 140, 1)
+    );
+    border-radius: 50%;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    margin: 0 auto;
+    margin-bottom: 21upx;
+
+  }
+  .iconpic {
+    width: 49upx;
+    height: 39upx;
+    margin: auto;
+  }
+  .desc {
+    // width:150upx;
+    color: #818181;
+    font-size: 24upx;
+    text-indent: 3upx;
+    white-space: nowrap;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/components/index/index-miaosha.vue b/src/components/index/index-miaosha.vue
new file mode 100644
index 0000000..e7c695a
--- /dev/null
+++ b/src/components/index/index-miaosha.vue
@@ -0,0 +1,111 @@
+<template>
+  <view>
+    <view v-bind:class="[choose==2 ? active : '', errclass]" v-if="choose!=3">
+      <view class="msphoto">
+        <img src="../../static/img/miaosha.png" alt class="mspic" />
+      </view>
+      <view class="pri">
+        <text class="price">￥0.01</text>
+        <view class="btn">
+          <text>立即抢</text>
+        </view>
+      </view>
+    </view>
+    <view v-bind:class="ms3" v-if="choose==3">
+      <view class="msphoto">
+        <img src="../../static/img/miaosha.png" alt class="mspic" />
+      </view>
+      <view class="pri">
+        <text class="price">￥{{price}}</text>
+        <view class="btn">
+          <text>立即抢</text>
+        </view>
+      </view>
+    </view>
+    <!-- choose:1 蓝色   choose:2  红色 choose3 黑色 -->
+  </view>
+</template>
+<script>
+export default {
+  name: "indexMiaosha",
+  data() {
+    return {
+      active: "miaosha1",
+      errclass: "miaosha",
+      ms3: "miaosha2"
+    };
+  },
+  props: {
+    choose: {
+      type: Number
+    },
+    price: {
+      type: Number
+    }
+  }
+};
+// price 秒杀的价格  choose 秒杀部分的背景色
+</script>
+<style lang="scss" scoped>
+.miaosha {
+  width: 176upx;
+  height: 195upx;
+  background: linear-gradient(
+    -45deg,
+    rgba(0, 74, 157, 1),
+    rgba(116, 180, 251, 1)
+  );
+  box-shadow: 0px 8upx 13upx 0px rgba(68, 136, 212, 0.3);
+
+  border-radius: 10upx;
+}
+.msphoto {
+  width: 148upx;
+  display: flex;
+  justify-content: center;
+  .mspic {
+    width: 125upx;
+    height: 119upx;
+  }
+}
+.pri {
+  display: flex;
+  margin-top: 24upx;
+  .price {
+    color: white;
+    font-size: 19upx;
+    margin-left: 9upx;
+    margin-top: 11upx;
+  }
+  .btn {
+    width: 95upx;
+    height: 38upx;
+    background: rgba(255, 255, 255, 0.2);
+    border-radius: 10upx;
+    color: white;
+    font-size: 20upx;
+    text-align: center;
+    margin-left: 11upx;
+    margin-top: 5upx;
+  }
+}
+.miaosha1 {
+  width: 176upx;
+  height: 195upx;
+  background: linear-gradient(
+    135deg,
+    rgba(255, 95, 24, 1),
+    rgba(255, 28, 28, 1)
+  );
+  box-shadow: 0px 8px 13px 0px rgba(255, 71, 31, 0.3);
+
+  border-radius: 10upx;
+}
+.miaosha2 {
+  width: 176upx;
+  height: 195upx;
+  background: linear-gradient(135deg, rgba(87, 87, 87, 1), rgba(55, 55, 55, 1));
+  box-shadow: 0px 8px 13px 0px rgba(74, 74, 74, 0.3);
+  border-radius: 10upx;
+}
+</style>
\ No newline at end of file
diff --git a/src/components/index/index-miaosha1.vue b/src/components/index/index-miaosha1.vue
new file mode 100644
index 0000000..ca616e1
--- /dev/null
+++ b/src/components/index/index-miaosha1.vue
@@ -0,0 +1,79 @@
+<template>
+  <view class="indexMiaosha1" @click="goto">
+    <view class="shop">
+      <img :src="imgpic" alt="" class="shoppic">
+    </view>
+    <view class="pri">
+        <text>￥{{price}}</text>
+        <text class="huaxian">￥{{huaxian}}</text>
+    </view>
+    <view class="xiangou">仅限{{xiangou}}件</view>
+  </view>
+</template>
+
+<script>
+export default {
+  name: "indexMiaosha1",
+  props:{
+    imgpic:{
+      type:String
+    },
+    price:{
+      
+    },
+    huaxian:{
+     
+    },
+    xiangou:{
+     
+    },
+    msid:{
+      
+    }
+
+  },
+  mounted(){
+    console.log(this.imgpic)
+  },
+  methods:{
+    goto(e){
+      console.log(this.msid)
+      uni.navigateTo({
+        url:"/pages/seckilldetail/seckilldetail?msid="+this.msid
+      })
+    }
+  }
+};
+</script>
+
+<style lang="scss">
+.indexMiaosha1 {
+  .shop {
+    width: 176upx;
+    height: 165upx;
+    background-color: #cf0f0f;
+  }
+  .pri{
+    color: #E32E10;
+    font-size: 20upx;
+    text-align: center;
+    margin-top: 21upx;
+    .huaxian{
+        color: #CCCCCC;
+        font-size: 14upx;
+        text-decoration: line-through;
+    }
+  }
+  .xiangou{
+      color: #CCCCCC;
+        font-size: 14upx;
+        text-align: center;
+        margin-top: 8upx;
+        margin-left: 5upx;
+  }
+  .shoppic{
+    width:100%;
+    height: 100%;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/components/index/index-search.vue b/src/components/index/index-search.vue
new file mode 100644
index 0000000..d42238f
--- /dev/null
+++ b/src/components/index/index-search.vue
@@ -0,0 +1,55 @@
+<template>
+    <view class="index-search">
+        <view class="box" @click="nav">
+            <image class="img" src="../../static/img/search.png"></image>
+            <view class="text">{{text}}</view>
+        </view>
+    </view>
+</template>
+<style lang="scss" scoped>
+.index-search{
+    .box{
+        width: 694upx;
+        height: 58upx;
+        background-color: #F1B967;
+        position: fixed;
+        left: 28upx;
+        top: 16upx;
+        border-radius: 29upx;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        z-index: 999;
+        .text{
+            font-size: 27upx;
+            color: #fff;
+            margin-left: 10upx;
+        }
+        .img{
+            width: 27upx;
+            height: 27upx;
+        }
+    }
+
+}
+</style>
+<script>
+name:"search";
+export default {
+    data(){
+        return {
+
+        }
+    },
+    props:["text"],
+    methods:{
+        nav(){
+            console.log("跳转")
+            uni.navigateTo({
+					url:"/pages/search/search"
+				})
+        }
+    }
+}
+// text 搜索框中的字
+</script>
\ No newline at end of file
diff --git a/src/components/index/index-select.vue b/src/components/index/index-select.vue
new file mode 100644
index 0000000..5597b68
--- /dev/null
+++ b/src/components/index/index-select.vue
@@ -0,0 +1,38 @@
+<template>
+  <view class="index-select">
+    <view class="bag">大保养</view>
+    <view class="sm">小保养</view>
+  </view>
+</template>
+<style lang="scss" scoped>
+.index-select {
+  width: 100%;
+  height: 103upx;
+  display: flex;
+  align-items: center;
+  border-bottom: 1upx solid #dcdcdc;
+  box-shadow:0px 1upx 1upx 0px rgba(49,49,49,0.19);
+  .bag {
+    width: 50%;
+    height: 64upx;
+    text-align: center;
+    line-height: 64upx;
+    border-right: 1upx solid #f1f1f1;
+  }
+  .sm {
+    width: 50%;
+    height: 64upx;
+    text-align: center;
+    line-height: 64upx;
+  }
+}
+</style>
+<script>
+name: "select";
+export default {
+  data() {
+    return {};
+  },
+  props: []
+};
+</script>
\ No newline at end of file
diff --git a/src/components/index/index-shopdetail.vue b/src/components/index/index-shopdetail.vue
new file mode 100644
index 0000000..3ede599
--- /dev/null
+++ b/src/components/index/index-shopdetail.vue
@@ -0,0 +1,100 @@
+<template>
+  <view class="index-shopdetail" @click="goto">
+    <img :src="picurl" alt class="shoppic" />
+    <view class="desc">
+      <view class="shopname">
+        <text class="tag" v-if="ifbk">爆款</text>
+        <text>{{shopname}}</text>
+      </view>
+      <view class="pri">
+          <view class="pri-icon">￥</view>
+          <view>{{pri}}</view>
+        <view class="sale">已拼{{sale}}件</view>
+      </view>
+    </view>
+  </view>
+</template>
+<script>
+export default {
+  name: "index-shopdetail",
+  props:{
+    picurl:{
+    },
+    ifbk:{
+      
+    },
+    shopname:{
+    },
+    pri:{
+    },
+    sale:{
+    },
+    ptid:{
+    }
+  },
+  methods:{
+    goto(){
+      console.log(this.ptid)
+    }
+  }
+};
+// 首页底部的商品详情
+// shoppic  商品图片   ifbk 是否为爆款  shopname  商品名  pri  商品价格  sale 商品售量
+
+</script>
+<style lang="scss" scoped>
+.index-shopdetail {
+  width: 646upx;
+  height: 173upx;
+  // border-bottom: 1upx solid #dcdcdc;
+  display: flex;
+  // justify-content: space-between;
+  .shoppic {
+    width: 137upx;
+    height: 132upx;
+    margin-left: 6upx;
+    margin-top: 12upx;
+    margin-right: 36upx;
+  }
+  .desc {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    margin-left: 37upx;
+    margin-bottom: 34upx;
+    .shopname {
+      color: #333333;
+      font-size: 28upx;
+
+      .tag {
+        width: 61upx;
+        height: 29upx;
+        background-color: #e32e10;
+        color: white;
+        font-size: 24upx;
+        text-align: center;
+        line-height: 29upx;
+        border-radius: 3upx;
+        padding-left: 10upx;
+        padding-right: 10upx;
+        margin-right: 7upx;
+      }
+    }
+    .pri {
+      font-size: 24upx;
+      color: #e32e10;
+      display: flex;
+
+      .pri-icon {
+        font-size: 18upx;
+        line-height: 36upx;
+      }
+      .sale {
+        color: #cfcfcf;
+        font-size: 22upx;
+        margin-left: 18upx;
+      }
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/components/index/index-spike.vue b/src/components/index/index-spike.vue
new file mode 100644
index 0000000..9635a27
--- /dev/null
+++ b/src/components/index/index-spike.vue
@@ -0,0 +1,45 @@
+<template>
+  <view class="index-spike">
+    <view class="left">{{title}}</view>
+    <view class="right" @click="more">更多</view>
+  </view>
+</template>
+<style lang="scss" scoped>
+.index-spike {
+  display: flex;
+  justify-content: space-between;
+  width: 673upx;
+  align-items: center;
+  .left {
+    color: #252525;
+    font-size: 36upx;
+  }
+  .right {
+    font-size: 26upx;
+    color: #b4b4b4;
+  }
+}
+</style>
+<script>
+export default {
+  name: "spike",
+  data() {
+    return {};
+  },
+  props: ["title"],
+  methods: {
+    more() {
+      if (this.title == "天天秒杀") {
+        uni.navigateTo({
+          url: "/pages/seckill/seckill"
+        });
+      } else if (this.title == "拼团购") {
+        uni.navigateTo({
+          url: "/pages/pintuanshop/pintuanshop"
+        });
+      }
+    }
+  }
+};
+// title   页面上每个模块的标题  如 天天秒杀
+</script>
\ No newline at end of file
diff --git a/src/components/index/index-swiper.vue b/src/components/index/index-swiper.vue
new file mode 100644
index 0000000..e7a93e1
--- /dev/null
+++ b/src/components/index/index-swiper.vue
@@ -0,0 +1,57 @@
+<template>
+  <view class="index-swiper">
+    <swiper class="swiper" :autoplay="true" interval="2500" :circular="true">
+      <swiper-item class="box"  v-for="(item,index) in list" @click="nav" :key="index" :data-id="item.goods_id">
+        <image :src="item.imgpath"></image>
+      </swiper-item>
+      <swiper-item class="box">
+        <image src="../../static/img/swiper.png"></image>
+      </swiper-item>
+      <swiper-item class="box">
+        <image src="../../static/img/swiper.png"></image>
+      </swiper-item>
+    </swiper>
+  </view>
+</template>
+<style lang="scss" scoped>
+.index-swiper{
+    width: 100%;
+    height: 390upx;
+    .swiper{
+        width: 100%;
+        height: 100%;
+        .box{
+            width: 100%;
+            height: 100%;
+            >image{
+                width: 100%;
+                height: 100%;
+            }
+        }
+    }
+}
+</style>
+<script>
+name: "swiper";
+export default {
+    props:{
+      list:{
+        type:Array
+      }
+    },
+    mounted(){
+      console.log(this.list[0],1313)
+    },
+    methods:{
+        nav(e){
+            console.log(e)
+            uni.navigateTo({
+             	url:"/pages/shopdetail/shopdetail?shopid="+e.currentTarget.dataset.id
+            })
+        },
+		index(){
+			
+		}
+    }
+};
+</script>
\ No newline at end of file
diff --git a/src/components/mine/mine-btn.vue b/src/components/mine/mine-btn.vue
new file mode 100644
index 0000000..babeb00
--- /dev/null
+++ b/src/components/mine/mine-btn.vue
@@ -0,0 +1,38 @@
+<template>
+  <view class="mineBtn">
+      <view class="title">{{title}}</view>
+      <img src=".../../static/img/arrow.png" alt="" class="arrow">
+  </view>
+</template>
+
+<script>
+export default {
+    name:"mineBtn",
+    props:{
+        title:{
+            type:String
+        }
+    }
+}
+</script>
+
+<style lang="scss">
+.mineBtn{
+    height: 100upx;
+    width: 100%;
+    display: flex;
+    justify-content: space-between;
+    line-height: 100upx;
+    .arrow{
+        width: 22upx;
+        height: 22upx;
+        margin: auto 0;
+        margin-right: 50upx;
+    }
+    .title{
+        font-size: 28upx;
+        color: #666666;
+        margin-left:30upx; 
+    }
+}
+</style>
\ No newline at end of file
diff --git a/src/components/mine/mine-menu.vue b/src/components/mine/mine-menu.vue
new file mode 100644
index 0000000..c0debbb
--- /dev/null
+++ b/src/components/mine/mine-menu.vue
@@ -0,0 +1,63 @@
+<template>
+  <view class="mineMenu">
+      <view class="menu1" @click="select(3)">
+          <img src="../../static/img/wallet.png" alt="" class="wallet">
+          <view class="title">全部</view>
+      </view>
+      <view class="menu1" @click="select(0)">
+          <img src="../../static/img/cart.png" alt="" class="wallet">
+          <view class="title">待付款</view>
+      </view>
+       <view class="menu1" @click="select(1)">
+          <img src="../../static/img/pingjia.png" alt="" class="wallet">
+          <view class="title">待收货</view>
+      </view>
+       <view class="menu1" @click="select(2)">
+          <img src="../../static/img/shouhou.png" alt="" class="wallet">
+          <view class="title title1">待评价</view>
+      </view>
+  </view>
+</template>
+
+<script>
+export default {
+name:"mineMenu",
+methods:{
+    select(e){
+        this.$emit("select",e)
+    }
+}
+}
+</script>
+
+<style lang="scss">
+.mineMenu{
+    width: 711upx;
+    height: 189upx;;
+    background:rgba(255,255,255,1);
+box-shadow:0upx 5upx 12upx 1upx rgba(222,71,66,0.41);
+border-radius:20upx;
+display: flex;
+justify-content: space-around;
+.menu1{
+    // width: 68upx;
+    margin:auto 0;
+        .wallet{
+        width: 38upx;
+        height: 34upx;
+        margin-left: 8upx;
+        margin-bottom: 25upx;
+    }
+    .title{
+        font-size: 22upx;
+        color: #333333;
+        text-align: center;
+    }
+    .title1{
+        position: relative;
+        right: 15upx;
+    }
+}
+
+}
+</style>
\ No newline at end of file
diff --git a/src/components/mine/mine-top.vue b/src/components/mine/mine-top.vue
new file mode 100644
index 0000000..3af65f7
--- /dev/null
+++ b/src/components/mine/mine-top.vue
@@ -0,0 +1,87 @@
+<template>
+  <view class="mineTop">
+    <img src="../../static/img/minebg.png" alt class="minetopbg" />
+    <img :src="iflogin?tx:'../../static/img/usertx.png'" alt class="photo" />
+
+    <text class="username">{{username}}</text>
+    <view class="login" v-if="!iflogin" @click="login">立即登录</view>
+  </view>
+</template>
+
+<script>
+export default {
+  name: "mineTop",
+  data() {
+    return {
+      tx: "",
+      username: "",
+      iflogin: false
+    };
+  },
+  mounted() {
+    wx.getSetting({
+      success: res => {
+        wx.getUserInfo({
+          success: res => {
+            console.log(res);
+            this.tx = res.userInfo.avatarUrl;
+            this.username = res.userInfo.nickName;
+            this.iflogin = true;
+          }
+        });
+      },
+      fail: res => {
+        this.tx = "../../static/img/usertx.png";
+        this.username = "";
+        this.iflogin = false;
+      }
+    });
+  },
+  methods: {
+    login() {
+      uni.redirectTo({
+        url: "/pages/login/login"
+      });
+    }
+  }
+};
+</script>
+
+<style lang="scss">
+.mineTop {
+  .minetopbg {
+    height: 300upx;
+    width: 100%;
+    position: relative;
+    z-index: -1;
+  }
+  .photo {
+    width: 130upx;
+    height: 115upx;
+    position: relative;
+    bottom: 283upx;
+    left: 31upx;
+    border-radius: 80%;
+  }
+  .username {
+    position: relative;
+    bottom: 338upx;
+    color: white;
+    font-size: 26upx;
+    margin-left: 48upx;
+  }
+  .login {
+    width: 147upx;
+    height: 47upx;
+    background: url("../../static/img/minelogin.png");
+    background-size: 100% 100%;
+    position: absolute;
+    top: 60rpx;
+    left: 170rpx;
+    color: white;
+    font-size: 20upx;
+    line-height: 47upx;
+    text-align: center;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/components/mygarage/mygarage-btn.vue b/src/components/mygarage/mygarage-btn.vue
new file mode 100644
index 0000000..684574f
--- /dev/null
+++ b/src/components/mygarage/mygarage-btn.vue
@@ -0,0 +1,42 @@
+<template>
+    <view class="mygarageBtn">
+        <view class="btn">
+            <img src="../../static/img/addnewcar.png" alt="" class="addnewcar">
+            <text class="desc">新增车型</text>
+        </view>
+    </view>
+</template>
+<script>
+export default {
+    name:'mygarageBtn'
+}
+</script>
+<style lang="scss">
+.mygarageBtn{
+    width:750upx;
+    height: 107upx;
+    background-color:white;
+    display:flex;
+    flex-direction:column;
+    justify-content:center;
+    .btn{
+        width: 717upx;
+        height: 82upx;
+        margin:0 auto;
+        background-color:#E03547;
+        display: flex;
+        justify-content: center;
+        .addnewcar{
+            width: 47upx;
+            height: 41upx;
+            margin: auto 0;
+        }
+        .desc{
+            color: white;
+            font-size: 31upx;
+            line-height: 85upx;
+            margin-left: 16upx;
+        }
+    }
+}
+</style>
\ No newline at end of file
diff --git a/src/components/mygarage/mygarage-list.vue b/src/components/mygarage/mygarage-list.vue
new file mode 100644
index 0000000..e86df65
--- /dev/null
+++ b/src/components/mygarage/mygarage-list.vue
@@ -0,0 +1,118 @@
+<template>
+  <view class="mygarage">
+    <view class="carinfo">
+      <img :src="picurl" alt class="caricon" />
+      <view class="carinfodetail">
+        <view class="carname">{{carname}}</view>
+        <view class="desc">{{cardesc}}</view>
+      </view>
+    </view>
+    <view class="btns">
+      <view class="btn" v-if="isdefault" >
+        <img src="../../static/img/bingo.png" alt class="default" />
+        <text class="mr">已设为默认</text>
+      </view>
+      <view class="del" v-else @click="mr(carid)">设为默认</view>
+      <view class="del" @click="del(carid)">删除</view>
+    </view>
+  </view>
+</template>
+<script>
+export default {
+  name: "mygarageList",
+  props:{
+    isdefault:{
+      type:Boolean
+    },
+    picurl:{
+      type:String
+    },
+    carname:{
+      type:String
+    },
+    cardesc:{
+      type:String
+    },
+    carid:{
+      type:Number
+    }
+  },
+  methods:{
+    mr(e){
+      console.log(74500000)
+      this.$emit('mr',e)
+    },
+    del(e){
+      this.$emit('del',e)
+    }
+  }
+};
+// isdefault: true  已设为默认    isdefault: false或不填  设为默认
+// picurl 车库页面商品图片  carname 车名  cardesc  车库页面的商品介绍
+</script>
+<style lang="scss" scoped>
+.mygarage {
+  height: 295upx;
+  background-color:white;
+  .carinfo {
+    height: 199upx;
+    display: flex;
+    border-bottom: 1upx solid #d9d9d9;
+    .caricon {
+      width: 96upx;
+      height: 96upx;
+      margin: auto 0;
+      margin-left: 55upx;
+    }
+    .carinfodetail {
+      // width: 276upx;
+      height: 95upx;
+      font-size: 26upx;
+      color: #3c3a3c;
+      margin-top: 51upx;
+      border-left: 1upx solid #d9d9d9;
+      margin-left: 56upx;
+      text-indent: 32upx;
+      .carname {
+        margin-top: 16upx;
+      }
+      .desc {
+        color: #999999;
+        font-size: 22upx;
+      }
+    }
+  }
+  .btns {
+    height: 94upx;
+    display: flex;
+    justify-content: space-around;
+    .btn {
+      width: 203upx;
+      height: 54upx;
+      border: 2upx solid #df3348;
+      margin: auto 0;
+      .default {
+        width: 27upx;
+        height: 25upx;
+        margin-left: 18upx;
+      }
+      .mr {
+        font-size: 25upx;
+        color: #df3348;
+        margin-left: 8upx;
+        line-height: 54upx;
+      }
+    }
+    .del {
+      width: 203upx;
+      height: 54upx;
+      border: 2upx solid #df3348;
+      margin: auto 0;
+      font-size: 25upx;
+      color: #df3348;
+      text-align: center;
+      line-height: 54upx;
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/components/offer/offer-list.vue b/src/components/offer/offer-list.vue
new file mode 100644
index 0000000..94d5fa4
--- /dev/null
+++ b/src/components/offer/offer-list.vue
@@ -0,0 +1,48 @@
+<template>
+  <view class="offer-list">
+    <view class="offer">
+        <img :src="picurl" alt="" class="nonepic">
+        <view class="desc">{{desc}}</view>
+    </view>
+  </view>
+</template>
+<script>
+export default {
+  name: "offerList",
+  props:{
+    picurl:{
+      type:String
+    },
+    desc:{
+      type:String
+    }
+  }
+};
+// 页面数据为空的时候（仅限于优惠券）
+// picurl 居中的图片  desc图片下面的字  
+</script>
+<style lang="scss" scoped>
+.offer-list {
+    width: 750upx;
+    height: 100vh;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+  .offer {
+    width: 479upx;
+    height: 421upx;
+    margin: auto;
+    .nonepic{
+        width: 479upx;
+        height: 356upx;
+    }
+    .desc{
+        width: 479upx;
+        color:#999999;
+        font-size: 26upx;
+        text-align: center;
+        margin-top: 38upx;
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/components/order/order-tab.vue b/src/components/order/order-tab.vue
new file mode 100644
index 0000000..96a92b6
--- /dev/null
+++ b/src/components/order/order-tab.vue
@@ -0,0 +1,85 @@
+<template>
+  <view class="orderTab">
+    <view :class="select[0]" @click="xz" data-tap="3">{{tabname}}</view>
+    <view :class="select[1]" @click="xz" data-tap="0">{{tabname1}}</view>
+    <view :class="select[2]" @click="xz" data-tap="1">{{tabname2}}</view>
+    <view :class="select[3]" @click="xz" data-tap="2">{{tabname3}}</view>
+  </view>
+</template>
+
+<script>
+export default {
+  name: "orderTab",
+  data() {
+    return {
+      select: ["active", "", "", ""],
+      tabname:"",
+      tabname2:'wwww',
+      tabname1:'ppp',
+      tabname3:'eeeee',
+      ceshi:"actice"
+    };
+  },
+  props:{
+    tap:{
+      type:Number
+    },
+    tabtittle:{
+      type:String
+    },
+    ifnull:{
+
+    }
+  },
+      mounted(){
+    this.tabname=this.tabtittle.split(',')[0]
+    this.tabname1=this.tabtittle.split(',')[1]
+    this.tabname2=this.tabtittle.split(',')[2]
+    this.tabname3=this.tabtittle.split(',')[3]
+      if(this.tap==3){
+           this.select = ["active", "", "", ""]
+      }else if(this.tap==0){
+           this.select = ["", "active", "", ""];
+      }else if(this.tap==1){
+        this.select = ["", "", "active", ""];
+      }else if(this.tap==2){
+        this.select = ["", "", "", "active"];
+      }
+  },
+  methods: {
+    xz(e) {
+      if(e.currentTarget.dataset.tap==3){
+           this.select = ["active", "", "", ""]
+      }else if(e.currentTarget.dataset.tap==0){
+           this.select = ["", "active", "", ""];
+      }else if(e.currentTarget.dataset.tap==1){
+        this.select = ["", "", "active", ""];
+      }else if(e.currentTarget.dataset.tap==2){
+        this.select = ["", "", "", "active"];
+      }
+    this.$emit("tabchange",e.currentTarget.dataset.tap)
+    },
+
+  }
+};
+</script>
+
+<style lang="scss">
+.orderTab {
+  height: 75upx;
+  display: flex;
+  justify-content: space-around;
+  font-size: 26upx;
+  color: #333333;
+  border-top: 3upx solid #eeeeee;
+  line-height: 75upx;
+  background-color: white;
+  .active {
+      // width:94upx;
+      text-align: center;
+        color: #F57426;
+    border-bottom: 1upx solid #F57426;
+  }
+
+}
+</style>
diff --git a/src/components/order/orderitem.vue b/src/components/order/orderitem.vue
new file mode 100644
index 0000000..f308220
--- /dev/null
+++ b/src/components/order/orderitem.vue
@@ -0,0 +1,183 @@
+<template>
+<view>
+  <view class="orderItem" v-for="(item,index) in shops" :key="index">
+    <view class="title">
+      <view class="orderno">订单编号：{{item.order_no}}</view>
+      <view class="state">{{item.state}}</view>
+    </view>
+    <view v-for="(i,j) in item.goods_list" :key="j">
+       <view class="shopinfo" >
+      <img :src="i.imgpaththumb" alt class="shoppic" />
+      <view class="right">
+        <view class="shopname">{{i.goods_name}}</view>
+        <view class="pri">
+          <view>共{{i.goods_num}}件</view>
+          <view class="money">￥{{i.price_z}}</view>
+        </view>
+      </view>
+    </view>
+    
+    </view>
+   <view class="btns">
+      <view class="btn" v-if="item.state=='待评价'" @click="pingjia(item.id)">前去评价</view>
+      <view class="btn" v-if="item.state=='待收货'" @click="shouhuo(item.id)">确定收货</view>
+      <view class="btn" v-if="item.state=='待付款'">微信支付</view>
+    </view>
+  </view>
+</view>
+
+</template>
+
+<script>
+import requestP from "../../static/js/request.js";
+export default {
+  name: "orderItem",
+  data() {
+    return {
+      status: ""
+    };
+  },
+  props: {
+    orderno: {
+      type: String
+    },
+    state: {
+      type: String
+    },
+    shops:{
+      type:Array
+    }
+  },
+  methods:{
+    pingjia(e){
+      uni.navigateTo({
+        url:"/pages/comment/comment?orderid="+e
+      })
+    },
+    shouhuo(e){
+      console.log(e)
+      requestP.requestP({
+        url:"order/shouhuo",
+        data:{
+          order_id:e
+        }
+      }).then((res)=>{
+          uni.showToast({
+              title: "收货成功",
+              icon: "success",
+              duration: 2000
+            });
+            this.state=e.kind
+    console.log(this.state)
+    requestP.requestP({
+      url:"order/get_order_list",
+    }).then((res)=>{
+      console.log(res.data.data)
+      this.orderlist=res.data.data  
+    })
+     requestP.requestP({
+      url:"order/get_order_list",
+      data:{
+        type:0
+      }
+    }).then((res)=>{
+      console.log(res.data.data)
+      this.orderlist0=res.data.data  
+    })
+    requestP.requestP({
+      url:"order/get_order_list",
+      data:{
+        type:1
+      }
+    }).then((res)=>{
+      console.log(res.data.data)
+      this.orderlist1=res.data.data  
+    })
+    requestP.requestP({
+      url:"order/get_order_list",
+      data:{
+        type:2
+      }
+    }).then((res)=>{
+      console.log(res.data.data)
+      this.orderlist2=res.data.data  
+    })
+      })
+    }
+  }
+};
+</script>
+
+<style lang="scss">
+.orderItem {
+  background-color: white;
+  .title {
+    width: 695upx;
+    height: 80upx;
+    line-height: 80upx;
+    margin: 0 auto;
+    display: flex;
+    justify-content: space-between;
+    .orderno {
+      font-size: 22upx;
+      color: #999999;
+      // line-height: 51upx;
+    }
+    .state {
+      font-size: 26upx;
+      color: #f57426;
+    }
+  }
+  .shopinfo {
+    width: 685upx;
+    height: 169upx;
+    border-top: 1upx solid #eeeeee;
+    border-bottom: 1upx solid #eeeeee;
+    display: flex;
+    justify-content: space-between;
+    margin: 0 auto;
+    // margin-top: upx;
+    .shoppic {
+      width: 149upx;
+      height: 149upx;
+      margin: auto 0;
+    }
+    .right {
+      color: #999999;
+      font-size: 22upx;
+      display: flex;
+      flex-direction: column;
+      justify-content: space-between;
+      .shopname {
+        width: 513upx;
+        line-height: 40upx;
+      }
+      .pri {
+        display: flex;
+        justify-content: space-between;
+        margin-bottom: 10upx;
+        .money {
+          color: #a50b18;
+          font-size: 32upx;
+        }
+      }
+    }
+  }
+  .btns {
+    height: 78upx;
+    font-size: 26upx;
+    margin-top: 8upx;
+    .btn {
+      width: 158upx;
+      height: 59upx;
+      text-align: center;
+      line-height: 59upx;
+      color: #a50b18;
+      border: 1upx solid rgba(165, 11, 24, 1);
+      float: right;
+      margin-right: 32upx;
+      margin-top: 8upx;
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/components/order/pintuanorderitem.vue b/src/components/order/pintuanorderitem.vue
new file mode 100644
index 0000000..b6e679d
--- /dev/null
+++ b/src/components/order/pintuanorderitem.vue
@@ -0,0 +1,163 @@
+<template>
+  <view class="pintuanorderitem">
+    <view class="top">
+      <img  :src="shoppic" alt class="left" />
+      <view class="right">
+        <view class="shopname">{{shopname}}</view>
+        <view class="pri">
+          <view>
+              <text class="num">{{num}}人团</text>
+              <text class="money">￥{{money}}</text>
+          </view>
+          <view class="state">{{state}}</view>
+        </view>
+      </view>
+    </view>
+    <view class="btns">
+        <view class="btn1" v-if="state=='拼团失败' && is_tuikuan == 0" @click="reboot">退款</view>
+        <!-- <view class="btn" v-if="state=='已成团'">查看订单详情</view> -->
+         <view class="btn" v-else @click="tiaozhuan">查看商品详情</view>
+    </view>
+  </view>
+</template>
+
+<script>
+import {requestP} from "../../static/js/request"
+export default {
+  name: "pintuanorderitem",
+  data(){
+      return {
+          status:""
+      }
+  },
+  props:{
+        shoppic:{
+      type:String
+  },
+  shopname:{
+      type:String
+  },
+  num:{
+      type:Number
+  },
+  money:{
+      type:Number
+  },
+  state:{
+      type:String
+  },
+  sid:{
+
+  },
+  is_tuikuan:{
+
+  },
+  shopid:{
+
+  }
+  },
+    mounted() {
+  
+  },
+  methods:{
+    reboot(){
+      
+      requestP({
+        url:"pay/pay_pintuan_tuikuan",
+        data:{
+        pt_order_id:this.sid
+        }
+      }).then((res)=>{
+        console.log(res)
+      })
+    },
+    tiaozhuan(){
+       uni.navigateTo({
+        url:"/pages/pintuanshopdetail/pintuanshopdetail?shopid="+this.shopid
+      })
+    }
+  }
+
+};
+</script>
+
+<style lang="scss">
+.pintuanorderitem {
+  height: 322upx;
+  width: 100%;
+  background-color: white;
+  .top {
+    width: 712upx;
+    height: 230upx;
+    margin: 0 auto;
+   margin-right: 30upx;
+    display: flex;
+    justify-content: space-between;
+    border-bottom: 1upx solid #D7D7D7;
+    .left {
+      margin-left: 15upx;
+      width: 170upx;
+      height: 186upx;
+       margin-top: 20upx;
+    }
+    .right {
+      display: flex;
+      flex-direction: column;
+      justify-content: space-between;
+      width: 380rpx;
+
+      .shopname {
+        color: #393939;
+        font-size: 26upx;
+        font-weight: 800;
+        margin-top: 24upx;
+      }
+      .pri{
+       display: flex;
+       justify-content: space-between;
+       margin-bottom: 40upx;
+       .num{
+           color: #1A1A1A;
+           font-size: 24upx;
+           padding-right:26upx;
+       }
+       .money{
+           color: #FF0107;
+           font-size: 36upx;
+       }
+        .state{
+            color: #FF5001;
+            font-size: 28upx;
+        }
+      }
+    }
+  }
+  .btns{
+      .btn{
+          width: 180upx;
+          height: 56upx;
+          border: 1upx solid #D7D7D7;
+          line-height: 56upx;
+          text-align:center;
+          color:#646464;
+          font-size: 24upx;
+          margin-top: 20upx;
+          float:right;
+          margin-right: 30upx;
+          border-radius: 10upx;
+      }
+      .btn1{
+          width: 142upx;
+          height: 56upx;
+          line-height:56upx;
+          background-color: #FF5001;
+          color: white;
+          font-size: 24upx;
+          text-align: center;
+          float:right;
+             margin-top: 20upx;
+              margin-right: 30upx;
+      }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/components/orderdetail/orderdetail-zongjia.vue b/src/components/orderdetail/orderdetail-zongjia.vue
new file mode 100644
index 0000000..e2125fd
--- /dev/null
+++ b/src/components/orderdetail/orderdetail-zongjia.vue
@@ -0,0 +1,33 @@
+<template>
+  <view class="orderdetailZongjia">
+      <view class="pri">
+          实付金额：￥{{zong}}
+      </view>
+  </view>
+</template>
+
+<script>
+export default {
+name:'orderdetailZongjia',
+props:{
+    zong:{
+        type:String
+    }
+}
+}
+</script>
+
+<style lang="scss">
+.orderdetailZongjia{
+    height: 80upx;
+    background-color: white;
+    margin-top:2upx;
+    .pri{
+        color: #FD4141;
+        font-size: 30upx;
+        float: right;
+        margin-right: 20upx;
+        line-height: 80upx;
+    }
+}
+</style>
\ No newline at end of file
diff --git a/src/components/orderdetail/orderdetailbtn.vue b/src/components/orderdetail/orderdetailbtn.vue
new file mode 100644
index 0000000..9a3fb9e
--- /dev/null
+++ b/src/components/orderdetail/orderdetailbtn.vue
@@ -0,0 +1,32 @@
+<template>
+          <view class="orderdetailBtn">
+      {{text}}
+  </view>
+
+</template>
+
+<script>
+export default {
+    name:"orderdetailBtn",
+    props:{
+        text:{
+            type:String
+        }
+    }
+}
+</script>
+
+<style lang="scss">
+.orderdetailBtn{
+    width: 710upx;
+    height: 80upx;
+    color: #333333;
+    font-size: 30upx;
+    line-height: 80upx;
+    text-align: center;
+    border-radius: 8upx;
+    border:2upx solid rgba(231, 231, 231, 1);
+    background-color: #F8F8F8;
+
+}
+</style>
\ No newline at end of file
diff --git a/src/components/orderdetail/orderdetailinfo.vue b/src/components/orderdetail/orderdetailinfo.vue
new file mode 100644
index 0000000..3461d1c
--- /dev/null
+++ b/src/components/orderdetail/orderdetailinfo.vue
@@ -0,0 +1,35 @@
+<template>
+  <view class="orderdetailInfo">
+     <view class="key"> {{key1}}：</view>
+     <view > {{val}}</view>
+      
+  </view>
+</template>
+
+<script>
+export default {
+  name:"orderdetailInfo",
+  props:{
+    key1:{
+      type:String
+    },
+    val:{
+      type:String
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+.orderdetailInfo{
+  // width: 478upx;
+  font-size: 26upx;
+  color: #868686;
+  text-indent: 20upx;
+  display: flex;
+  line-height: 46upx;
+  .key{
+    width: 160upx;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/components/orderdetail/orderdetailinfos.vue b/src/components/orderdetail/orderdetailinfos.vue
new file mode 100644
index 0000000..192d3cc
--- /dev/null
+++ b/src/components/orderdetail/orderdetailinfos.vue
@@ -0,0 +1,39 @@
+<template>
+  <view class="orderdetailInfos">
+    <view class="infos">
+      <orderdetailInfos key1="订单编号" val="415257513567170998833" class="info"></orderdetailInfos>
+      <orderdetailInfos key1="下单时间" val="2018-05-08 11:49 " class="info"></orderdetailInfos>
+      <orderdetailInfos key1="支付方式" val="微信" class="info"></orderdetailInfos>
+    </view>
+
+  
+  </view>
+</template>
+
+<script>
+import orderdetailInfos from "../../components/orderdetail/orderdetailinfo";
+
+export default {
+  name: "orderdetailInfos",
+  components: {
+    orderdetailInfos,
+    
+  }
+};
+</script>
+
+<style lang="scss">
+page {
+  background-color: #f0f0f0;
+}
+.orderdetailInfos {
+  .infos{
+      height:  186upx;
+      width: 100%;
+        display: flex;
+  flex-direction: column;
+  justify-content: center;
+      background-color: white;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/components/orderdetail/orderdetailpay.vue b/src/components/orderdetail/orderdetailpay.vue
new file mode 100644
index 0000000..4ce211c
--- /dev/null
+++ b/src/components/orderdetail/orderdetailpay.vue
@@ -0,0 +1,58 @@
+<template>
+<view class="pays">
+        <view class="orderdetailPay">                                                                                         
+            <view class="left">商品总额：</view>
+            <view class="right">￥{{all}} </view>
+    </view>
+       <view class="orderdetailPay">                                                                                         
+            <view class="left">优惠券：</view>
+            <view class="right">-￥{{youhui}} </view>
+    </view>
+       <view class="orderdetailPay">                                                                                         
+            <view class="left">运费：</view>
+            <view class="right">+￥{{yunfei}} </view>
+    </view>
+</view>
+
+</template>
+
+<script>
+export default {
+    name:"orderdetailPay",
+    props:{
+            all:{
+                    type:String
+            },
+            youhui:{
+                    type:String
+            },
+            yunfei:{
+                    type:String
+            }
+    }
+}
+</script>
+
+<style lang="scss">
+.pays{
+        // height: 186upx;
+        background-color: white;
+             padding-top: 31upx;
+     padding-bottom: 31upx;
+}
+.orderdetailPay{
+    display: flex;
+    justify-content: space-between;
+     color:#868686;
+     font-size: 26upx;
+     line-height: 46upx;
+     margin: auto 0;
+
+     .left{
+             margin-left: 20upx;
+     }
+     .right{
+             margin-right: 25upx;
+     }
+}
+</style>
\ No newline at end of file
diff --git a/src/components/orderdetail/orderdetailreceive.vue b/src/components/orderdetail/orderdetailreceive.vue
new file mode 100644
index 0000000..7ce1be3
--- /dev/null
+++ b/src/components/orderdetail/orderdetailreceive.vue
@@ -0,0 +1,21 @@
+<template>
+  <view class="shopdetailReceive">
+      <orderdetailTittle tittle0="收货信息"></orderdetailTittle>
+  </view>
+</template>
+
+<script>
+import orderdetailTittle from "../../components/orderdetail/orderdetailtitt"
+export default {
+    name:"orderdetailReceive",
+    components:{
+        orderdetailTittle
+    }
+}
+</script>
+
+<style lang="scss">
+.shopdetailReceive{
+
+}
+</style>
\ No newline at end of file
diff --git a/src/components/orderdetail/orderdetailshopinfo.vue b/src/components/orderdetail/orderdetailshopinfo.vue
new file mode 100644
index 0000000..c066a1b
--- /dev/null
+++ b/src/components/orderdetail/orderdetailshopinfo.vue
@@ -0,0 +1,72 @@
+<template>
+<view class="box">
+  <view class="shopdetailShopinfo" v-for="(i,j) in list" :key="j">
+    <img :src="i.imgpaththumb" alt class="shoppic" />
+    <view class="right">
+      <view class="shopname">{{i.goods_name}}</view>
+      <view class="shoppri">
+        <view class="price">{{i.price_z}}</view>
+        <view class="num">
+            <text class="num1">x</text>
+            <text>{{i.goods_num}}</text>
+        </view>
+      </view>
+    </view>
+  </view>
+</view>
+
+</template>
+
+<script>
+export default {
+  name: "shopdetailShopinfo",
+  props:['list']
+};
+</script>
+
+<style lang="scss">
+.shopdetailShopinfo {
+  height: 161upx;
+  width: 642upx;
+  background-color: white;
+  display: flex;
+  justify-content: space-between;
+  margin:0 auto;
+  .shoppic {
+    width: 161upx;
+    height: 161upx;
+  }
+  .right {
+      margin-left: 20upx;
+    .shopname {
+      width: 461upx;
+      font-size: 28upx;
+      color: #333333;
+      margin-bottom: 44upx;
+    }
+    .shoppri {
+      width: 463upx;
+      display: flex;
+      justify-content: space-between;
+      font-size: 30upx;
+      .price {
+        color: #e52323;
+      }
+      .num {
+        color: #333333;
+            .num1{
+                color: #868686;
+            }
+      }
+    }
+  }
+}
+.box{
+    height: 208upx;
+    width: 100%;
+    background-color: white;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+}
+</style>
\ No newline at end of file
diff --git a/src/components/orderdetail/orderdetailtitt.vue b/src/components/orderdetail/orderdetailtitt.vue
new file mode 100644
index 0000000..220a79e
--- /dev/null
+++ b/src/components/orderdetail/orderdetailtitt.vue
@@ -0,0 +1,28 @@
+<template>
+  <view class="shopdetailtittle">
+      {{tittle0}}
+  </view>
+</template>
+
+<script>
+export default {
+name:"shopdetailTittle",
+props:{
+    tittle0:{
+        type:String
+    }
+}
+}
+</script>
+
+<style lang="scss">
+.shopdetailtittle{
+height: 81upx;
+width: 100%;
+background-color: white;
+font-size: 26upx;
+text-indent:21upx;
+color: #333333;
+line-height: 81upx;
+}
+</style>
\ No newline at end of file
diff --git a/src/components/ordersub/ordersub-btn.vue b/src/components/ordersub/ordersub-btn.vue
new file mode 100644
index 0000000..0223849
--- /dev/null
+++ b/src/components/ordersub/ordersub-btn.vue
@@ -0,0 +1,54 @@
+<template>
+  <view>
+    <view class="orderdetailBtn">
+      <view class="left">{{left}}</view>
+      <view class="right">
+        <text>{{right}}</text>
+        <img src="../../static/img/arrow.png" alt class="arrow" />
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  name: "ordersubBtn",
+  props:{
+      left:{
+          type:String,
+      },
+      right:{
+        type:String,
+      }
+  }
+}; 
+// 提交订单页面  选择付款方式和优惠券 的按钮
+// left 选择的标题  如选择付款方式    right  选择的具体选项
+
+</script>
+
+<style lang="scss">
+.orderdetailBtn {
+  height: 86upx;
+  background-color: white;
+  display: flex;
+  justify-content: space-between; 
+  color:#333333;
+  font-size: 27upx;
+  line-height: 86upx;
+  .left{
+    margin-left: 29upx;
+  }
+  .right {
+    display: flex;
+    margin-right: 25upx;
+
+    .arrow {
+      width: 17upx;
+      height: 31upx;
+      margin: auto 0;
+      margin-left: 22upx;
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/components/ordersub/ordersub-nouser.vue b/src/components/ordersub/ordersub-nouser.vue
new file mode 100644
index 0000000..ed9ac71
--- /dev/null
+++ b/src/components/ordersub/ordersub-nouser.vue
@@ -0,0 +1,111 @@
+<template>
+  <view class="box" v-if="ifnull" @click="close">
+    <view class="mid">
+      <view class="tittle">完善收货人信息</view>
+      <view class="desc">您的收货人信息不完整，请完善收货人信息</view>
+      <!-- <view class="btn">
+        <img src="../../static/img/wechaticon.png" alt class="icon" />
+        <text>一键获取微信地址</text>
+      </view> -->
+        <view class="btn1">
+        <img src="../../static/img/addicon.png" alt class="icon" />
+        <text>手动添加联系人信息</text>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  name: "ordersubNouser",
+  data(){
+      return {
+              ifnull1:""
+      }
+  
+  },
+    props:{
+        ifnull:{
+            type:Boolean,
+            value:""
+        }
+    },
+    methods:{
+        close(){
+            this.ifnull1=false
+            this.$emit("charge",this.ifnull1)
+        }
+    }
+};
+</script>
+
+<style lang="scss">
+.box {
+  width: 100%;
+  height: 100vh;
+  // background-color: #7F7F7F;
+  background-color: rgba(127, 127, 127, 0.5);
+  position: absolute;
+  top: 0;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  // opacity:0.5;
+  .mid {
+    width: 539upx;
+    height: 502upx;
+    background-color: white;
+    margin: 0 auto;
+    border-radius: 5upx;
+    .tittle {
+      color: #333333;
+      font-size: 32upx;
+      font-size: 500;
+      text-align: center;
+      margin-top: 53upx;
+      margin-bottom: 49upx;
+    }
+    .desc {
+      color: #666666;
+      font-size: 26upx;
+      text-align: center;
+    }
+    .btn {
+      width: 449upx;
+      height: 95upx;
+      background-color: #df3348;
+      line-height: 95upx;
+      display: flex;
+      justify-content: center;
+      color: white;
+      font-size: 28upx;
+      margin: 0 auto;
+      margin-top: 36upx;
+      .icon {
+        width: 44upx;
+        height: 45upx;
+        margin: auto 0;
+        margin-right: 7upx;
+      }
+    }
+    .btn1 {
+      width: 449upx;
+      height: 95upx;
+    border: 2px solid rgba(223,51,72,1);
+       line-height: 95upx;
+      display: flex;
+      justify-content: center;
+      color: #DF3348;
+      font-size: 26upx;
+      margin: 0 auto;
+      margin-top: 36upx;
+            .icon {
+        width: 26upx;
+        height: 26upx;
+        margin: auto 0;
+        margin-right: 18upx;
+      }
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/components/ordersub/ordersub-pay.vue b/src/components/ordersub/ordersub-pay.vue
new file mode 100644
index 0000000..127a4ef
--- /dev/null
+++ b/src/components/ordersub/ordersub-pay.vue
@@ -0,0 +1,77 @@
+<template>
+  <view class="ordersubPay">
+    <view class="desc">
+      <view>
+        <text class="realpay">实付:</text>
+        <text class="icon">￥</text>
+        <text class="money">{{shifu}}</text>
+      </view>
+      <view class="hd">
+        新人(除轮)）满
+        <text class="full">{{full}}</text>元免邮
+      </view>
+    </view>
+    <view class="btn" @click="pay">立即支付</view>
+  </view>
+</template>
+
+<script>
+export default {
+  name: "ordersubPay",
+  props:{
+    shifu:{
+      type:Number
+    },
+    full:{
+      type:Number
+    }
+  },
+  methods:{
+    pay(){
+      this.$emit("pay",true)
+    }
+  }
+};
+// shifu: 实际支付   full满多少减
+</script>
+
+<style lang="scss">
+.ordersubPay {
+  height: 123upx;
+  background-color: white;
+  display: flex;
+  justify-content: space-between;
+  .desc {
+    color: #df3348;
+    margin: auto 0;
+    margin-left: 33upx;
+    .realpay {
+      font-size: 23upx;
+      color: #666666;
+    }
+    .icon {
+      font-size: 33upx;
+    }
+    .money {
+      font-size: 31upx;
+    }
+  }
+  .hd{
+    color:#666666;
+    font-size: 18upx;
+    .full{
+      color: #DF3348;
+    }
+  }
+  .btn{
+    width: 357upx;
+    height:83upx;
+    color:white;
+    text-align: center;
+    line-height: 83upx;
+    background-color: #DF3348;
+    margin: auto 0;
+    font-size: 28upx;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/components/ordersub/ordersub-price.vue b/src/components/ordersub/ordersub-price.vue
new file mode 100644
index 0000000..d0dde6a
--- /dev/null
+++ b/src/components/ordersub/ordersub-price.vue
@@ -0,0 +1,61 @@
+<template>
+  <view class="ordersubPrice">
+    <view class="pri">
+      <view class="left">{{desc}}</view>
+      <view class="price"  v-if="ifyh">
+        <text class="icon yh">-￥</text>
+        <text class="qian yh">{{pri}}</text>
+      </view>
+      <view class="price" v-else>
+        <text class="icon">￥</text>
+        <text class="qian" >{{pri}}</text>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  name: "ordersubPrice",
+  props: {
+    desc: {
+      type: String
+    },
+    pri: {
+      type: String
+    },
+    ifyh: {
+      type: Boolean
+    }
+  }
+};
+// 订单提交页面  各种其他费用
+// desc  费用名称  pri  价格  ifyh 是否使用优惠券
+</script>
+
+<style lang="scss">
+.ordersubPrice {
+  font-size: 27upx;
+  .pri {
+    display: flex;
+    justify-content: space-between;
+    margin-top: 34upx;
+    .left {
+      margin-left: 30upx;
+    }
+    .price {
+      color: #df3348;
+      margin-right: 30upx;
+      .icon {
+        font-size: 31upx;
+      }
+      .qian {
+        font-size: 29upx;
+      }
+    }
+    .yh {
+      color: #53b01f;
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/components/ordersub/ordersub-pricearr.vue b/src/components/ordersub/ordersub-pricearr.vue
new file mode 100644
index 0000000..ab22c55
--- /dev/null
+++ b/src/components/ordersub/ordersub-pricearr.vue
@@ -0,0 +1,43 @@
+<template>
+  <!-- <ordersubPrice desc="商品总价" pri="158.00"></ordersubPrice> -->
+  <view class="ordersubPricearr">
+    <ordersubPrice desc="商品总价" :pri="zongjia"></ordersubPrice>
+    <ordersubPrice desc="运费" :pri="yf"></ordersubPrice>
+    <ordersubPrice desc="优惠券" :pri="yhq" class="lastpri" ifyh=true></ordersubPrice>
+  </view>
+</template>
+
+<script>
+import ordersubPrice from "./ordersub-price";
+export default {
+  name: "ordersubPricearr",
+  components: {
+    ordersubPrice
+  },
+  props:{
+    zongjia:{
+      type:Number
+    },
+    yf:{
+      type:Number
+    },
+    yhq:{
+      type:Number
+    }
+  }
+};
+</script>
+
+<style lang="scss">
+.ordersubPricearr {
+//   height: 289upx;
+  background-color: white;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  .lastpri{
+      margin-bottom: 40upx;
+  }
+  
+}
+</style>
\ No newline at end of file
diff --git a/src/components/ordersub/ordersub-shops.vue b/src/components/ordersub/ordersub-shops.vue
new file mode 100644
index 0000000..10aff67
--- /dev/null
+++ b/src/components/ordersub/ordersub-shops.vue
@@ -0,0 +1,65 @@
+<template>
+  <view>
+    <view class="orderShop">
+      <view class="shops">
+        <view>
+          <img v-for="item in shops" :key="item" :src="item.imgpaththumb" alt class="shop" />
+        </view>
+        <view class="sum">共{{shops.length}}件商品、1项服务</view>
+      </view>
+      <!-- <img src="../../static/img/arrow.png" alt class="arrow" /> -->
+    </view>
+  </view>
+  <!-- shops 传字符串，不同图片用，分割 -->
+</template>
+
+<script>
+export default {
+  name: "ordersubShop",
+  data() {
+    return {
+      shopsarr:[]
+    };
+  },
+  props: {
+    shops: {
+      type: Array
+    }
+  },
+  created() {
+    // this.shopsarr=this.shops.split(',')
+    console.log(this.shopsarr)
+  }
+};
+// shops 提交订单的商品图片数组 字符串形式，不同图片用， 分割
+</script>
+
+<style lang="scss">
+.orderShop {
+  height: 267upx;
+  background-color: white;
+  display: flex;
+  justify-content: space-between;
+  .shops {
+    height: 194upx;
+    margin-top: 30upx;
+    margin-left: 29upx;
+    .shop {
+      width: 140upx;
+      height: 140upx;
+      margin-right: 8upx;
+    }
+  }
+  .sum {
+    color: #333333;
+    font-size: 27upx;
+    margin-top: 28upx;
+  }
+  .arrow {
+    width: 17upx;
+    height: 31upx;
+    margin: auto 0;
+    margin-right: 25upx;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/components/ordersub/ordersub-userinfo.vue b/src/components/ordersub/ordersub-userinfo.vue
new file mode 100644
index 0000000..3759192
--- /dev/null
+++ b/src/components/ordersub/ordersub-userinfo.vue
@@ -0,0 +1,110 @@
+<template>
+  <view class="bj">
+     <view class="addrnull" v-if="addrnull" @click="newaddr">添加收货地址</view>
+    <view class="orderdetailUserinfo" v-else>
+      <view class="info">
+        <view class="userinfo">
+          <view>
+            <img src="../../static/img/person.png" alt class="photo" />
+            <text>{{username}}</text>
+          </view>
+          <view>
+            <img src="../../static/img/tel.png" alt class="photo" />
+            <text>{{tel}}</text>
+          </view>
+        </view>
+        <view>
+          <view>
+            <img src="../../static/img/position.png" alt class="photo" />
+            <text>{{address}}</text>
+          </view>
+        </view>
+      </view>
+      <!-- <view class="arrow"></view> -->
+      <img src="../../static/img/arrow.png" alt class="arrow" />
+    </view>
+    
+    <img src="../../static/img/border.png" alt="" class="line">
+  </view>
+</template>
+<script>
+export default {
+  name: "ordersubUserinfo",
+  props:{
+    username:{
+      type:String
+    },
+    tel:{
+      type:String
+    },              
+    address:{
+      type:String
+    },
+    addrnull: {
+      type:Boolean
+    }
+  },
+  methods:{
+    newaddr(){
+      uni.navigateTo({
+        url:"/pages/addr-add/addr-add"
+      })
+    }
+  }
+};
+// userinfo="张三" tel="12345678910" address="山东省泰安市宁阳县文庙街道XX小区"
+</script>
+<style lang="scss">
+.bj{
+  background-color: white;
+  padding-top: 20upx;
+  padding-bottom: 20upx;    
+}
+.orderdetailUserinfo {
+  height: 155upx;
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  background-color: white;
+  .info {
+    width: 530upx;
+    height: 99upx;
+    font-size: 27upx;
+    margin-left: 30upx;
+         margin-top: 35upx;
+    .userinfo {
+      display: flex;
+      justify-content: space-between;
+      margin-bottom: 27upx;
+ 
+    }
+    .photo {
+      width: 32upx;
+      height: 35upx;
+      margin-right: 22upx;
+    }
+  }
+  .arrow {
+    width: 17upx;
+    height: 31upx;
+    margin: auto 0;
+    margin-right: 25upx;
+  }
+}
+.line{
+    height: 9upx;
+    width: 100%;
+}
+.addrnull{
+    width: 557upx;
+    height:83upx;
+    color:white;
+    text-align: center;
+    line-height: 83upx;
+    background-color: #DF3348;
+    margin: auto 0;
+    font-size: 28upx;
+    margin: 0 auto;
+  margin-top: 20upx;
+}
+</style>
\ No newline at end of file
diff --git a/src/components/ordersub/ordersub-youhui.vue b/src/components/ordersub/ordersub-youhui.vue
new file mode 100644
index 0000000..c605281
--- /dev/null
+++ b/src/components/ordersub/ordersub-youhui.vue
@@ -0,0 +1,202 @@
+<template>
+  <view class="box" @click="close1">
+    <view class="youhui">
+      <scroll-view :scroll-y="true" class="scroll-Y" @scroll="scroll" @click.stop="a">
+        <view class="top">
+          <text class="tittle">领取优惠券</text>
+          <view class="close" @click="close1">
+            <img src="../../static/img/close.png" alt class="close" />
+          </view>
+        </view>
+        <view class="midbox">
+          <view class="mid">
+            <view class="yhqs">
+              <view class="yhq" v-for="(i,j) in yhqall" :key="j">
+                <view class="left">
+                  <view class="price">
+                    <text class="moneyicon">￥</text>
+                    <text>{{i.price}}</text>
+                  </view>
+                  <view>满{{i.min}}元可用</view>
+                  <view>有效期{{i.starttime}}-{{i.endtime}}</view>
+                </view>
+                <view class="right">
+                  <view class="getter" v-if="ifget" @click="useyhq" :data-yhqid="i.yhq_id" :data-yhqpri="i.price">立即使用</view>
+                  <view class="getter" v-else @click="getyhq" :data-id="i.yhq_id">立即领取</view>
+                  <img src="../../static/img/geted.png" alt class="geted" v-if="ifget" />
+                </view>
+              </view>
+            </view>
+          </view>
+        </view>
+      </scroll-view>
+      <!-- <view class="bottom">
+        <view class="more">查看更多</view>
+        <view class="btn">更多</view>
+      </view>-->
+    </view>
+  </view>
+</template>
+
+<script>
+import { requestP } from "../../static/js/request";
+export default {
+  name: "youhui",
+  props: {
+    ifyouhui: {
+      type: Boolean
+    },
+    yhqall: {
+      type: Array
+    },
+    ifget: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {};
+  },
+  methods: {
+    close1() {
+      this.$emit("off", false);
+    },
+    getyhq(e) {
+      console.log("yhq");
+      requestP({
+        url: "youhuiquan/add",
+        data: {
+          yhq_id: e.currentTarget.dataset.id
+        }
+      }).then(res => {
+        console.log(res);
+        if (res.data.code == 1) {
+          uni.showToast({
+            title: "领取成功",
+            icon: "success",
+            duration: 2000
+          });
+          requestP({
+            url: "youhuiquan/get_list_all"
+          }).then(res => {
+            console.log(res, "youhui");
+            this.yhqall = res.data.data;
+          });
+        }
+      });
+    },
+    useyhq(e){
+      console.log(e)
+      this.$emit("yhqpri",e.currentTarget.dataset.yhqpri)
+      this.$emit("yhqid",e.currentTarget.dataset.yhqid)
+      this.close1()
+    },
+    a() {},
+    scroll() {}
+  },
+  mounted() {}
+};
+</script>
+
+<style lang="scss">
+.scroll-Y {
+  height: 93%;
+}
+.box {
+  width: 100vw;
+  height: 100vh;
+  background: rgba(0, 0, 0, 0.55);
+  position: absolute;
+  top: 0;
+}
+.youhui {
+  width: 100%;
+  height: 70%;
+  background-color: white;
+  position: absolute;
+  top: 377upx;
+  .top {
+    color: #333;
+    font-size: 34rpx;
+    text-align: center;
+    position: fixed;
+    width: 100%;
+    z-index: 999;
+    .tittle {
+      margin-top: 31upx;
+    }
+    .close {
+      width: 45upx;
+      height: 45upx;
+      float: right;
+      margin-right: 30upx;
+    }
+  }
+  .mid {
+    .yhqs {
+      margin-top: 50upx;
+      .yhq {
+        width: 689upx;
+        height: 173upx;
+        background: url("../../static/img/yhqbj.png");
+        background-size: 100% 100%;
+        margin: 0 auto;
+        margin-bottom: 20upx;
+        display: flex;
+        justify-content: space-between;
+        .left {
+          color: #e01212;
+          font-size: 24upx;
+          margin: auto 0;
+          margin-left: 37upx;
+          .price {
+            font-size: 50upx;
+            .moneyicon {
+              font-size: 43upx;
+            }
+          }
+        }
+        .right {
+          color: #e01212;
+          font-size: 32upx;
+          .getter {
+            position: relative;
+            top: 71upx;
+            right: 61upx;
+          }
+          .geted {
+            width: 93upx;
+            height: 80upx;
+            position: relative;
+            top: 42upx;
+            left: 33upx;
+            z-index: 0;
+          }
+        }
+      }
+    }
+  }
+  .bottom {
+    .more {
+      color: #e01212;
+      font-size: 28upx;
+      text-align: center;
+      margin-top: 26upx;
+      margin-bottom: 22upx;
+    }
+    .btn {
+      width: 100%;
+      height: 96upx;
+      color: white;
+      line-height: 96upx;
+      text-align: center;
+      background-color: #e01212;
+      margin-top: 75upx;
+    }
+  }
+  .midbox {
+    position: relative;
+    top: 100rpx;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/components/pintuanshop/pintuanshop-line.vue b/src/components/pintuanshop/pintuanshop-line.vue
new file mode 100644
index 0000000..8bf0ef2
--- /dev/null
+++ b/src/components/pintuanshop/pintuanshop-line.vue
@@ -0,0 +1,19 @@
+<template>
+    <view class="pintuanshopLine">
+
+    </view>
+</template>
+
+<script>
+export default {
+    name:"pintuanshopLine"
+}
+</script>
+
+<style lang="scss">
+.pintuanshopLine{
+    width: 100%;
+    height: 20upx;
+    background-color: #FFEEEE
+}
+</style>
\ No newline at end of file
diff --git a/src/components/pintuanshop/pintuanshop-nav.vue b/src/components/pintuanshop/pintuanshop-nav.vue
new file mode 100644
index 0000000..b437074
--- /dev/null
+++ b/src/components/pintuanshop/pintuanshop-nav.vue
@@ -0,0 +1,100 @@
+<template>
+  <view class="pintuanshopNav">
+    <swiper class="swiper" display-multiple-items="4" @change="aa" :current="cupage" circular=true>
+      <swiper-item style="margin-left:50upx" slideTo v-for="(item,index) in navlist" :key="index">
+        <view :class="xz1[index]?active:navitem" @click="xz" :data-id="index">{{item}}</view>
+        
+      </swiper-item>
+      <!-- <swiper-item style="margin-left:50upx">
+        <view :class="xz1[1]?active:navitem" @click="xz" data-id="1">保养套餐</view>
+      </swiper-item>
+      <swiper-item style="margin-left:50upx">
+        <view :class="xz1[2]?active:navitem" @click="xz" data-id="2">轮胎专区</view>
+      </swiper-item>
+      <swiper-item style="margin-left:50upx">
+        <view :class="xz1[3]?active:navitem" @click="xz" data-id="3">车载电器</view>
+      </swiper-item>
+      <swiper-item style="margin-left:50upx">
+        <view :class="xz1[4]?active:navitem" @click="xz" data-id="4">美容养护</view>
+      </swiper-item>
+      <swiper-item style="margin-left:50upx">
+        <view :class="xz1[5]?active:navitem" @click="xz" data-id="5">安全自驾</view>
+      </swiper-item>
+      <swiper-item style="margin-left:50upx">
+        <view :class="xz1[6]?active:navitem" @click="xz" data-id="6">汽车内饰</view>
+      </swiper-item>
+      <swiper-item style="margin-left:50upx">
+        <view :class="xz1[7]?active:navitem" @click="xz" data-id="7">汽车用品</view>
+      </swiper-item>
+      <swiper-item style="margin-left:50upx">
+        <view :class="xz1[8]?active:navitem" @click="xz" data-id="8">其他</view>
+      </swiper-item> -->
+    </swiper>
+  </view>
+</template>
+
+<script>
+export default {
+  name: "pintuanshopNav",
+  data() {
+    return {
+      autoplay: false,
+      active: "active",
+      navitem: "navitem",
+      xz1: [1],
+      cupage: 0,
+      nav:[]
+    };
+  },
+  props:{
+    navlist:{
+      type:Array
+    }
+  },
+  methods: {
+    aa(a) {
+      this.a = a.detail.current;
+    },
+    xz(e) {
+      this.xz1 = [];
+      this.xz1[e.currentTarget.dataset.id] = 1;
+
+      if (parseInt(e.currentTarget.dataset.id) <= 1) {
+        this.cupage = 0;
+      } else {
+        if (parseInt(e.currentTarget.dataset.id) < 7) {
+          this.cupage = parseInt(e.currentTarget.dataset.id) - 2;
+        } else {
+          this.cupage = 5;
+        }
+      }
+      this.$emit("selected",e.currentTarget.dataset.id)
+    }
+  },
+  mounted(){
+    console.log(this.navlist)
+  }
+};
+</script>
+
+<style lang="scss">
+.pintuanshopNav{
+  background-color: white;
+  line-height: 62upx;
+}
+.swiper {
+  height: 62upx;
+}
+.navitem {
+  width: 120upx;
+  font-size: 30upx;
+  color: #666666;
+  text-align: center;
+}
+.active {
+  width: 120upx;
+  color: #e0394d;
+  font-size: 30upx;
+  text-align: center;
+}
+</style>
\ No newline at end of file
diff --git a/src/components/pintuanshop/pintuanshops.vue b/src/components/pintuanshop/pintuanshops.vue
new file mode 100644
index 0000000..c18e26f
--- /dev/null
+++ b/src/components/pintuanshop/pintuanshops.vue
@@ -0,0 +1,119 @@
+<template>
+  <view class="pintuanshops" @click="todetail">
+    <view class="pic">
+      <img :src="shoppic" alt class="pic" />
+    </view>
+    <view class="shopname">
+    {{shopname}}
+    </view>
+    <view class="price">
+        <view class="nowmoney">
+            <text class="nowmoneyicon">￥</text>
+            <text>{{pri}}</text>
+            <text class="huaxian">￥{{huaxian}}</text>
+             <view class="num">已拼{{yipin}}件</view>
+        </view>
+        <view class="btn">去开团</view>
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  name: "pintuanshops",
+  props:{
+    shoppic:{
+      type:String
+    },
+    shopname:{
+      type:String
+    },
+    pri:{
+      type:Number
+    },
+    huaxian:{
+      type:Number
+    },
+    yipin:{
+      type:Number
+    },
+    shopid:{
+      type:Number
+    }
+  },
+  methods:{
+    todetail(e){
+      console.log(this.shopid)
+      uni.navigateTo({
+        url:"/pages/pintuanshopdetail/pintuanshopdetail?shopid="+this.shopid
+      })
+    }
+  }
+};
+</script>
+
+<style lang="scss">
+.pintuanshops {
+  width: 369upx;
+  height: 553upx;
+  background-color: white;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  .pic {
+    width: 283upx;
+    height: 327upx;
+    margin: 0 auto;
+    margin-top:5upx;
+  }
+  .shopname {
+    width: 259upx;
+    font-size: 22upx;
+    color: #333333;
+    margin: 0 auto;
+  }
+  .price {
+    display: flex;
+    width: 326upx;
+    height: 52upx;
+    justify-content: space-between;
+    color: #888888;
+    font-size: 22upx;
+    margin: 0 auto;
+    margin-bottom: 30upx;
+    // line-height: 52upx;
+    .nowmoney {
+      color: #e32e10;
+      font-size: 27upx;
+      .nowmoneyicon {
+        font-size: 24upx;
+      }
+      .huaxian {
+        font-size: 18upx;
+        color:#888888;
+        text-decoration: line-through
+      }
+      .num{
+          color: #888888;
+          font-size: 22upx;
+      }
+    }
+    .btn {
+      width: 118upx;
+      height: 42upx;
+      background: linear-gradient(
+        0deg,
+        rgba(230, 56, 83, 1) 0%,
+        rgba(228, 61, 84, 1) 100%
+      );
+      border-radius: 21upx;
+      color: white;
+      line-height: 42upx;
+      text-align: center;
+      font-size: 20upx;
+      margin: auto 0;
+      margin-top: 21upx;
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/components/pintuanshopdetail/pintuandetail-ale.vue b/src/components/pintuanshopdetail/pintuandetail-ale.vue
new file mode 100644
index 0000000..98d7d55
--- /dev/null
+++ b/src/components/pintuanshopdetail/pintuandetail-ale.vue
@@ -0,0 +1,29 @@
+<template>
+  <view class="pintuanshopdetailale">
+    {{ale}}
+  </view>
+</template>
+
+<script>
+export default {
+  name: "pintuanshopdetailale",
+  props:{
+    ale:{
+      type:String
+    }
+  }
+};
+</script>
+
+<style lang="scss">
+.pintuanshopdetailale{
+  // height: 121upx;
+  width: 673upx;
+  background-color: white;
+  color: #333333;
+  font-size: 22upx;
+  margin: 0 auto;
+  margin-top: 33upx;
+  margin-bottom: 32upx;
+}
+</style>
\ No newline at end of file
diff --git a/src/components/pintuanshopdetail/pintuandetail-bottom.vue b/src/components/pintuanshopdetail/pintuandetail-bottom.vue
new file mode 100644
index 0000000..f41c672
--- /dev/null
+++ b/src/components/pintuanshopdetail/pintuandetail-bottom.vue
@@ -0,0 +1,86 @@
+<template>
+    <view class="box">
+        <view class="index" style="margin-left:30upx;margin-right:82upx;">
+            <image src="../../static/img/index.png">
+
+            </image>
+            <view>首页</view>
+        </view>
+        <view class="index" style="margin-right:44upx;"><image src="../../static/img/server.png">
+
+            </image>
+            <view>客服</view></view>
+        <view class="alone" style="margin-right:7upx;" @click="dandubuy">
+            <view>￥{{dan}}</view>
+            <view>单独购买</view>
+        </view>
+        <view class="group" @click="group">
+             <view>￥{{pin}}</view>
+            <view>拼团购卖</view>
+        </view>
+    </view>
+</template>
+<style lang="scss" scoped>
+.box{
+    width: 750upx;
+    height: 106upx;
+    background-color: #fff;
+    display: flex;
+    align-items: center;
+    .index{
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        >image{
+            width: 38upx;
+            height: 35upx;
+            margin-bottom: 8upx;
+        }
+        >view{
+            font-size: 20upx;
+            color: #666666;
+        }
+    }
+    .alone{
+        width: 197upx;
+        height: 79upx;
+        border:1px solid rgba(222,53,72,1);
+        border-radius: 5upx;
+        display: flex;
+        font-size: 26upx;
+        color: #DE3548;
+        justify-content: center;
+        flex-direction: column;
+        align-items: center;
+    }
+    .group{
+        width: 287upx;
+        height: 83upx;
+        background:rgba(222,53,72,1);
+        border-radius: 5upx;
+
+        display: flex;
+        font-size: 26upx;
+        color: #FFFFFF;
+        justify-content: center;
+        flex-direction: column;
+        align-items: center;
+
+    }
+}
+</style>
+<script>
+export default {
+    name:"pintuandetail-bottom",
+    props:['dan','pin'],
+    methods:{
+        dandubuy(){
+            this.$emit("dandu",true)
+        },
+         group(){
+             console.log("pplkio")
+            this.$emit("group",true)
+        }
+    }
+}
+</script>
\ No newline at end of file
diff --git a/src/components/pintuanshopdetail/pintuandetail-list.vue b/src/components/pintuanshopdetail/pintuandetail-list.vue
new file mode 100644
index 0000000..38902c6
--- /dev/null
+++ b/src/components/pintuanshopdetail/pintuandetail-list.vue
@@ -0,0 +1,155 @@
+<template>
+  <view class="pintuandetaillist">
+    <view class="list" v-for="(item,j) in pintuanlist" :key="j">
+      <view class="left">
+        <img :src="item.avatar_url" alt class="user" />
+        <view class="username">{{item.uname}}</view>
+      </view>
+      <view class="right">
+        <view class="xq">
+          <view class="cha">
+            还差
+            <text class="number">{{item.hcrs_num}}人</text>拼成
+          </view>
+         <view class="djs">
+            剩余
+            <countdown :hour="shijian(item.dqtime)[0] " :minute="shijian(item.dqtime)[1]" :second="shijian(item.dqtime)[2]"></countdown>
+          </view>
+        </view>
+        <view class="btn" @click="cantuan" :data-ptorderid="item.pt_order_id">去参团</view>
+      </view>
+    </view>
+    <!-- <view class="list">
+      <view class="left">
+        <img src="../../static/img/pintuanuser.png" alt class="user" />
+        <view class="username">Awen</view>
+      </view>
+      <view class="right">
+        <view class="xq">
+          <view class="cha">
+            还差
+            <text class="number">3人</text>拼成
+          </view>
+          <view class="djs">
+            剩余
+            <countdown hour="1" minute="12" second="40"></countdown>
+          </view>
+        </view>
+        <view class="btn">去参团</view>
+      </view>
+    </view> -->
+  </view>
+</template>
+
+<script>
+import countdown from "../seckill/countdown";
+export default {
+  name: "pintuandetaillist",
+  components: {
+    countdown
+  },
+  data(){
+    return {
+      time1:[]
+    }
+  },
+  props:{
+    pintuanlist:{
+      type:Array
+    }
+  },
+methods:{
+     shijian(completeTime) {
+      console.log(completeTime)
+          var stime = Date.parse(new Date());
+          var etime = Date.parse(new Date(completeTime));
+          console.log(stime,etime)
+          // 两个时间戳相差的毫秒数
+          var usedTime = etime - stime;
+          // 计算相差的天数  
+          // var days = Math.floor(usedTime / (24 * 3600 * 1000));
+          // 计算天数后剩余的毫秒数
+          var leave1 = usedTime % (24 * 3600 * 1000);  
+          // 计算出小时数  
+          var hours = Math.floor(usedTime / (3600 * 1000));
+          // 计算小时数后剩余的毫秒数
+          var leave2 = leave1 % (3600 * 1000);        
+          // 计算相差分钟数
+          var minutes = Math.floor(leave2 / (60 * 1000));
+          var leave3 = leave2 % (60 * 1000)
+           var s = Math.floor(leave3 / (1000));
+          var time = [hours,minutes,s];
+          console.log(time)
+          return time;
+    },
+    cantuan(e){
+      console.log(e)
+      this.$emit("cantuan",true)
+      this.$emit("getorderid",e.currentTarget.dataset.ptorderid)
+    }
+},
+  mounted(){
+    console.log(this.pintuanlist,7946)
+    // for()
+  }
+};
+</script>
+
+<style lang="scss">
+.pintuandetaillist {
+  // height: 347upx;
+  width: 100%;
+  background-color: white;
+  .list {
+    width: 693upx;
+    height: 65upx;
+    display: flex;
+    justify-content: space-between;
+    margin: 0 auto;
+    margin-bottom: 43upx; 
+    .left {
+      .user {
+        width: 60upx;
+        height: 60upx;
+        float: left;
+      }
+      .username {
+        color: #999999;
+        font-size: 28upx;
+        float: left;
+        line-height: 45upx;
+        text-indent: 18upx;
+      }
+    }
+    .right {
+      // width: 327upx;
+      height: 65upx;
+      display: flex;
+      .xq {
+        .cha {
+          color: #333333;
+          font-size: 28upx;
+          .number {
+            color: #dd3447;
+          }
+        }
+        .djs {
+          color: #333333;
+          font-size: 22upx;
+          display:flex;
+        }
+      }
+      .btn {
+        width: 150upx;
+        height: 65upx;
+        background-color: #db3446;
+        color: white;
+        line-height: 65upx;
+        text-align: center;
+        font-size: 28upx;
+        margin-left: 25upx;
+      }
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/components/pintuanshopdetail/pintuanline1.vue b/src/components/pintuanshopdetail/pintuanline1.vue
new file mode 100644
index 0000000..3e26491
--- /dev/null
+++ b/src/components/pintuanshopdetail/pintuanline1.vue
@@ -0,0 +1,17 @@
+<template>
+  <view class="line"></view>
+</template>
+
+<script>
+export default {
+name:"pintuanline"
+}
+</script>
+
+<style lang="scss">
+.line{
+    height: 19upx;
+    width: 100%;
+    background-color: #EEEEEE;
+}
+</style>
\ No newline at end of file
diff --git a/src/components/pintuanshopdetail/pintuanlisttop.vue b/src/components/pintuanshopdetail/pintuanlisttop.vue
new file mode 100644
index 0000000..fdbdd5c
--- /dev/null
+++ b/src/components/pintuanshopdetail/pintuanlisttop.vue
@@ -0,0 +1,66 @@
+<template>
+  <view class="pintuanlisttop">
+       <view class="listtop">
+      <view class="left">{{title1}}</view>
+      <!-- <view class="right">
+        <text class="des">{{right}}</text>
+        <img src="../../sctatic/img/arrowmore.png" alt class="arrow" />
+      </view> -->
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+    name:"pintuanlisttop",
+    props:{
+      title1:{
+        type:String
+      },
+      right:{
+        type:String,
+        default:'查看更多'
+      }
+    },
+   mounted(){
+     console.log(this.title1,99965552)
+   }
+}
+</script>
+
+<style lang="scss">
+.pintuanlisttop{
+  .listtop {
+    height: 91upx;
+    display: flex;
+    line-height: 91upx;
+    justify-content: space-between;
+    .left {
+      color: #333333;
+      font-size: 26upx;
+      line-height: 91upx;
+      padding-left: 31upx;
+    }
+    .right {
+      height: 91upx;
+      color: #999999;
+      font-size: 28upx;
+      // line-height: 91upx;
+      float: right;
+      padding-right: 21upx;
+
+      .desc {
+        color: #999999;
+        font-size: 28upx;
+        padding-right: 26upx;
+      }
+      .arrow {
+        width: 14upx;
+        height: 25upx;
+        // float    : right;
+        margin: auto 0;
+      }
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/components/pintuanshopdetail/pintuanrule.vue b/src/components/pintuanshopdetail/pintuanrule.vue
new file mode 100644
index 0000000..ec39ede
--- /dev/null
+++ b/src/components/pintuanshopdetail/pintuanrule.vue
@@ -0,0 +1,30 @@
+<template>
+  <view class="pintuanrule">
+      <pintuanlisttop title1="拼团玩法" right="规则说明"></pintuanlisttop>
+      <view class="content">支付开团并邀请3人呢参加，组团成功即可发货</view>
+  </view>
+</template>
+
+<script>
+import pintuanlisttop from "../../components/pintuanshopdetail/pintuanlisttop"
+export default {
+    name:"pintuanrule",
+    components:{
+        pintuanlisttop
+    }
+}
+</script>
+
+<style lang="scss">
+.pintuanrule{
+    height:149upx;
+    width: 100%;
+    .content{
+        color: #333333;
+        font-size: 28upx;
+        margin-left:31upx;
+        margin-top: 10upx;
+        margin-bottom: 37upx;
+    }
+}
+</style>
\ No newline at end of file
diff --git a/src/components/pintuanshopdetail/pintuanshopdetail-top.vue b/src/components/pintuanshopdetail/pintuanshopdetail-top.vue
new file mode 100644
index 0000000..552cfee
--- /dev/null
+++ b/src/components/pintuanshopdetail/pintuanshopdetail-top.vue
@@ -0,0 +1,112 @@
+<template>
+  <view class="pintuanshopdetailtop">
+    <shopdetailToppic
+      :picarr="picarr"
+      v-on:btnchange="change0"
+    ></shopdetailToppic>
+    <view class="price">
+      <text class="money">￥{{money}}</text>
+      <text class="huaxian">￥{{huaxian}}</text>
+    </view>
+    <view class="num">已团{{yituan}}单·{{tuantotle}}人团</view>
+    <view class="shopname">{{shopname}}</view>
+    <shopdetailEnsure :ensurepic="ensurepic" :ensures="ensures" v-on:more="more"></shopdetailEnsure>
+  </view>
+</template>
+<script>
+import shopdetailToppic from "../../components/shopdetail/shopdetail-toppic";
+import shopdetailBtn from "../../components/shopdetail/shopdetail-btn";
+import shopdetailEnsure from "../../components/shopdetail/shopdetail-ensure";
+export default { 
+  name: "pintuanshoptop",
+  props:{
+    money:{
+      type:Number
+    },
+    huaxian:{
+      type:Number
+    },
+    shopname:{
+      type:String
+    },
+    ensures:{
+      type:String
+    },
+    picarr:{
+      type:Array,
+    },
+    yituan:{
+      type:Number
+    },
+    tuantotle:{
+      type:Number
+    },
+    ensurepic:{
+      type:String
+    }
+  },
+  components: {
+    shopdetailToppic,
+    shopdetailBtn,
+    shopdetailEnsure,
+  },
+  data() {
+    return {
+      ifsp: "",
+      ifservice:false
+    };
+  },
+  methods: {
+    change0(e) {
+      // console.log(e)
+      this.ifsp = e;
+    },
+      off(e){
+      console.log(e)
+      this.ifservice=e
+    },
+      more(e){
+       this.ifservice=e
+    }
+  }
+};
+</script>
+
+<style lang="scss">
+.pintuanshopdetailtop {
+  .btn {
+    width: 227upx;
+    display: flex;
+    justify-content: space-between;
+    margin: 0 auto;
+    position: relative;
+    bottom: 76upx;
+  }
+  .price{
+    margin-left:27upx;
+    margin-top:36upx;
+    .money{
+      color:#E32E10;
+      font-size: 49upx;
+    }
+    .huaxian{
+      color:#666666;
+      font-size: 27upx;
+      padding-left: 21upx;
+      text-decoration: line-through;
+    }
+  }
+  .num{
+      color:#666666;
+      font-size: 27upx; 
+      margin-left: 39upx;
+  }
+  .shopname{
+    width: 673upx;
+    color: #333333;
+    font-size: 26upx;
+    margin: 0 auto;
+    margin-top:33upx;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/components/proyear/proyear-carinfo.vue b/src/components/proyear/proyear-carinfo.vue
new file mode 100644
index 0000000..26af0e1
--- /dev/null
+++ b/src/components/proyear/proyear-carinfo.vue
@@ -0,0 +1,41 @@
+<template>
+  <view class="proyearcarinfo">
+      <view>
+           <img :src="carpic" class="icon"/>
+           <text class="carname">{{carname}}</text>
+      </view>
+     
+  </view>
+</template>
+<script>
+export default {
+  name: "proyearCarinfo",
+  props:{
+    carname:{
+      type:String
+    },
+    carpic:{
+      type:String
+    }
+  }
+};
+</script>
+<style lang="scss" scoped>
+.proyearcarinfo {
+  height: 90upx;
+  width: 100vm;
+  background-color: #df3348;
+  display:flex;
+  flex-direction: column;
+  justify-content: center;
+  .icon{
+      width: 85upx;
+      height: 41upx;
+      margin-left: 17upx;
+  }
+  .carname{
+      color: white;
+      font-size: 26upx;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/components/proyear/proyear-choose.vue b/src/components/proyear/proyear-choose.vue
new file mode 100644
index 0000000..dc0bdb5
--- /dev/null
+++ b/src/components/proyear/proyear-choose.vue
@@ -0,0 +1,61 @@
+<template>
+  <view class="proyearchoose">
+    <view>
+         <text class="desc">{{desc}}</text>
+    <img src="../../static/img/arrow.png" alt class="arrow" v-if="ifarrow" />
+    <view class="line" v-if="ifline"></view>
+    </view>
+ 
+    <view v-if="ifchoosecx">
+       <text class="desc">{{cx}}</text>
+      <img src="../../static/img/arrow.png" alt class="arrow" v-if="ifarrow" />
+      <view class="line" v-if="ifline"></view>
+    </view>
+    
+  </view>
+</template>
+<script>
+export default {
+  name: "proyearChoose",
+  props: {
+    ifarrow: {
+      type: Boolean
+    },
+     ifchoosecx: {
+      type: Boolean
+    },
+    desc: {
+      type: String
+    },
+    ifline:{
+        type:Boolean
+    },
+    cx:{
+      type:String
+    }
+  }
+};
+</script>
+<style lang="scss">
+.proyearchoose {
+  height: 90upx;
+  display: flex;
+  .desc {
+    font-size: 26upx;
+    color:#3C3A3C;
+    line-height: 90upx;
+    margin-left: 32upx;
+    margin-right: 22upx;
+  }
+  .arrow {
+    width: 11upx;
+    height: 20upx;
+  }
+  .line {
+    width: 722upx;
+    height: 2upx;
+    background: rgba(217, 217, 217, 1);
+    margin:0 auto;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/components/proyear/proyear-choose1.vue b/src/components/proyear/proyear-choose1.vue
new file mode 100644
index 0000000..8b4f393
--- /dev/null
+++ b/src/components/proyear/proyear-choose1.vue
@@ -0,0 +1,60 @@
+<template>
+  <view class="proyearchoose">
+    <view>
+         <text class="desc">{{desc}}</text>
+    <img src="../../static/img/arrow.png" alt class="arrow" v-if="ifarrow" />
+    <view class="line" v-if="ifline"></view>
+    </view>
+       <view>
+         <text class="desc">{{cx}}</text>
+    <img src="../../static/img/arrow.png" alt class="arrow" v-if="ifarrow" />
+    <view class="line" v-if="ifline"></view>
+    </view>
+    
+  </view>
+</template>
+<script>
+export default {
+  name: "proyearChoose1",
+  props: {
+    ifarrow: {
+      type: Boolean
+    },
+     ifchoosecx: {
+      type: Boolean
+    },
+    desc: {
+      type: String
+    },
+    ifline:{
+        type:Boolean
+    },
+    cx:{
+      type:String
+    }
+  }
+};
+</script>
+<style lang="scss">
+.proyearchoose {
+  height: 90upx;
+  display: flex;
+  .desc {
+    font-size: 26upx;
+    color:#3C3A3C;
+    line-height: 90upx;
+    margin-left: 32upx;
+    margin-right: 22upx;
+  }
+  .arrow {
+    width: 11upx;
+    height: 20upx;
+  }
+  .line {
+    width: 722upx;
+    height: 2upx;
+    background: rgba(217, 217, 217, 1);
+    margin:0 auto;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/components/proyear/proyear-choosetitle.vue b/src/components/proyear/proyear-choosetitle.vue
new file mode 100644
index 0000000..f5d89b3
--- /dev/null
+++ b/src/components/proyear/proyear-choosetitle.vue
@@ -0,0 +1,25 @@
+<template>
+    <view class="proyearaChoosetitle">
+        {{desc}}
+    </view>
+</template>
+<script>
+export default {
+    name:'proyearChoosetitle',
+    props:{
+        desc:{
+            type:String
+        }
+    }
+}
+</script>
+<style lang="scss">
+.proyearaChoosetitle{
+    height: 58upx;
+    background-color: #EEEEEE;
+    text-indent: 30upx;
+    color: #040404;
+    font-size: 22upx;
+    line-height: 58upx
+}
+</style>
\ No newline at end of file
diff --git a/src/components/search/searchChexing.vue b/src/components/search/searchChexing.vue
new file mode 100644
index 0000000..85d36b4
--- /dev/null
+++ b/src/components/search/searchChexing.vue
@@ -0,0 +1,26 @@
+<template>
+  <view class="searchChexing">{{chexing}}</view>
+</template>
+
+<script>
+export default {
+  name: "searchChexing",
+  props:{
+    chexing:{
+      type:String
+    }
+  }
+};
+// chexing : tab切换栏下面的那行字
+</script>
+
+<style lang="scss">
+.searchChexing {
+  height: 77upx;
+  color: #333333;
+  font-size: 24upx;
+  line-height: 77upx;
+  text-indent: 27upx;
+      border-top: 3upx solid #EEEEEE;
+}
+</style>
\ No newline at end of file
diff --git a/src/components/search/searchShop.vue b/src/components/search/searchShop.vue
new file mode 100644
index 0000000..31ea2bc
--- /dev/null
+++ b/src/components/search/searchShop.vue
@@ -0,0 +1,97 @@
+<template>
+  <view class="searchShop">
+    <img :src="pic" alt class="shop" />
+    <view class="shopdesc">
+      <view class="shopname">
+        {{shopname}}
+          <view style="margin-top:3upx;font-size:20upx;">{{tag}}</view>
+      </view>
+      <view class="pri">
+        <view class="price">
+          <text class="money">
+            <text class="icon">￥</text>{{pri}}
+          </text>
+        </view>
+        <view class="zhushi">{{zhushi}}</view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  name: "searchShop",
+  props:{
+      shopname:{
+          type:String
+      },
+      pri:{
+          type:Number
+      },
+      tag:{
+            type:String
+      },
+      zhushi:{
+          type:String
+      },
+      pic:{
+        type:String
+      }
+  }
+};
+// shopname : 商品名  pri:商品价格  tag待安装标签里的内容  zhushi：底部注释
+</script>
+
+<style lang="scss">
+.searchShop {
+  display: flex;
+  justify-content: space-between;
+  border-top: 3upx solid #eeeeee;
+  border-bottom: 3upx solid #eeeeee;
+  .shop {
+    width: 249upx;
+    height: 243upx;
+    margin: auto 0;
+    margin-right: 13upx;
+  }
+  .shopdesc {
+    width: 450upx;
+    font-size: 26upx;
+    color: #666666;
+    .shopname {
+      width: 443upx;
+    }
+  }
+  .pri {
+    margin-top: 86upx;
+    .price {
+      .money {
+        font-size: 36upx;
+        color: #ea2544;
+        .icon {
+          font-size: 19upx;
+        }
+      }
+      .tag {
+        width: 68upx;
+        height: 31upx;
+        border: 1upx solid #3299ba;
+        color: #3299ba;
+        text-align: center;
+        line-height: 31upx;
+        font-size: 16upx;
+        padding: 6upx 9upx;
+        margin-left: 16upx;
+        position: relative;
+        top: -5upx;
+      }
+    }
+    .zhushi {
+      font-size: 18upx;
+      color: #999999;
+      margin-top: 16upx;
+      padding-bottom: 16upx;
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/components/search/searchShuru.vue b/src/components/search/searchShuru.vue
new file mode 100644
index 0000000..3721cb2
--- /dev/null
+++ b/src/components/search/searchShuru.vue
@@ -0,0 +1,70 @@
+<template>
+  <view class="searchShuru">
+    <view class="shuru">
+      <img src="../../static/img/search1.png" alt class="search" />
+      <input type="text" :placeholder="content" style="width:620upx" @confirm="sousuo" />
+      <!-- <img src="../../static/img/del.png" alt class="del" v-if="isdel" /> -->
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  name: "searchShuru",
+  props: {
+    isdel: {
+      type: Boolean
+    },
+    content: {
+      type: String,
+      value: ""
+    }
+  },
+  methods:{
+    sousuo(a){
+      console.log(a.detail.value)
+      this.$emit("sousuo",a.detail.value)
+    }
+  }
+};
+// isdel 是否有错号  content: placeholder提示的内容
+</script>
+
+<style lang="scss">
+.searchShuru {
+  .shuru {
+    width: 704upx;
+    height: 50upx;
+    margin: 0 auto;
+    border-radius: 25upx;
+    color: black;
+    background-color: #efefef;
+    font-size: 22upx;
+    text-indent: 79upx;
+    line-height: 50upx;
+    // position: relative;
+    align-items: center;
+    display: flex;
+    justify-content: center;
+    top: 24rpx;
+  }
+  .search {
+    width: 26upx;
+    height: 25upx;
+    // position: relative;
+    z-index: 999;
+    top: -30rpx;
+    left: 56upx;
+  }
+  .del {
+    width: 26upx;
+    height: 25upx;
+    // position: relative;
+    z-index: 999;
+    top: -32rpx;
+    left: 630upx;
+  }
+}
+input::-webkit-input-placeholder {
+}
+</style>
\ No newline at end of file
diff --git a/src/components/search/searchTap.vue b/src/components/search/searchTap.vue
new file mode 100644
index 0000000..c62fea0
--- /dev/null
+++ b/src/components/search/searchTap.vue
@@ -0,0 +1,71 @@
+<template>
+  <view class="searchTap">
+    <view :class="select[0]" @click="xz" data-tap="0">{{tabname}}</view>
+    <view :class="select[1]" @click="xz" data-tap="1">{{tabname1}}</view>
+    <view :class="select[2]" @click="xz" data-tap="2">{{tabname2}}</view>
+    <!-- <view :class="select[3]" @click="xz" data-tap="4">{{tabname3}}</view> -->
+  </view>
+</template>
+
+<script>
+export default {
+  name: "searchTap",
+  data() {
+    return {
+      select: ["active", "", "", ""],
+      tabname:"",
+      tabname2:'wwww',
+      tabname1:'ppp',
+      tabname3:'eeeee',
+      ceshi:"actice"
+    };
+  },
+  props:{
+    tabtittle:{
+      type:String
+    },
+    iforder:{
+      type:Boolean
+    }
+  },
+      mounted(){
+    this.tabname=this.tabtittle.split(',')[0]
+    this.tabname1=this.tabtittle.split(',')[1]
+    this.tabname2=this.tabtittle.split(',')[2]
+    // this.tabname3=this.tabtittle.split(',')[3]
+  },
+  methods: {
+    xz(e) {
+      if(e.currentTarget.dataset.tap==0){
+           this.select = ["active", "", ""]
+      }else if(e.currentTarget.dataset.tap==1){
+           this.select = ["", "active", ""];
+      }else if(e.currentTarget.dataset.tap==2){
+        this.select = ["", "", "active"];
+      }
+      this.$emit("shaixuan",e.currentTarget.dataset.tap)
+   
+    },
+
+  }
+};
+</script>
+
+<style lang="scss">
+.searchTap {
+  height: 75upx;
+  display: flex;
+  justify-content: space-around;
+  font-size: 26upx;
+  color: #333333;
+  border-top: 3upx solid #eeeeee;
+  line-height: 75upx;
+  .active {
+    color: #d35f79;
+  }
+  .active1{
+    color: #F57426;
+    border-bottom: 1upx solid #F57426;
+  }
+}
+</style>
diff --git a/src/components/seckill/countdown.vue b/src/components/seckill/countdown.vue
new file mode 100644
index 0000000..d1f73a9
--- /dev/null
+++ b/src/components/seckill/countdown.vue
@@ -0,0 +1,154 @@
+<template>
+	<view class="uni-countdown">
+		<view v-if="showDay" class="uni-countdown__number" :style="{borderColor:borderColor, color:color}">{{d}}</view>
+		<view v-if="showDay" class="uni-countdown__splitor" :style="{color:splitorColor}">天</view>
+		<view class="uni-countdown__number" :style="{borderColor:borderColor, color:color}">{{h}}</view>
+		<view class="uni-countdown__splitor" :style="{color:splitorColor}">{{showColon ? ':' : '时'}}</view>
+		<view class="uni-countdown__number" :style="{borderColor:borderColor, color:color}">{{i}}</view>
+		<view class="uni-countdown__splitor" :style="{color:splitorColor}">{{showColon ? ':' : '分'}}</view>
+		<view class="uni-countdown__number" :style="{borderColor:borderColor, color:color}">{{s}}</view>
+		<view v-if="!showColon" class="uni-countdown__splitor" :style="{color:splitorColor}">秒</view>
+	</view>
+</template>
+<script>
+	export default {
+		name: "countdown",
+		props: {
+			showDay: {
+				type: Boolean,
+				default: false
+			},
+			showColon: {
+				type: Boolean,
+				default: true
+			},
+			backgroundColor: {
+				type: String,
+				default: "#FFFFFF"
+			},
+			borderColor: {
+				type: String,
+				default: "#000000"
+			},
+			color: {
+				type: String,
+				value: "#000000"
+			},
+			splitorColor: {
+				type: String,
+				default: "#000000"
+			},
+			day: {
+				default: 0
+			},
+			hour: {
+				default: 0
+			},
+			minute: {
+				default: 0
+			},
+			second: {
+				default: 0
+			}
+		},
+		data() {
+			return {
+				timer: null,
+				d: '00',
+				h: '00',
+				i: '00',
+				s: '00',
+				leftTime: 0,
+				seconds: 0
+			}
+		},
+		created: function(e) {
+			// this.seconds = this.toSeconds(this.day, this.hour, this.minute, this.second)
+			// this.countDown()
+			this.timer = setInterval(() => {
+				
+				if(this.seconds == 0){
+				// console.log(123)
+				this.seconds = this.toSeconds(this.day, this.hour, this.minute, this.second)
+				}
+				this.seconds--
+				if (this.seconds < 0) {
+					this.timeUp()
+					return
+				}
+				// console.log(this.seconds)
+				this.countDown()
+			}, 1000)
+		}, 
+		beforeDestroy() {
+			clearInterval(this.timer)
+		},
+		methods: {
+			toSeconds(day, hours, minutes, seconds) {
+				return (day * 60 * 60 * 24) + (hours * 60 * 60) + (minutes * 60) + seconds
+			},
+			timeUp() {
+				clearInterval(this.timer)
+				this.$emit('timeup')
+			},
+			countDown() {
+				let seconds = this.seconds
+                let [day, hour, minute, second] = [0, 0, 0, 0]
+				if (seconds > 0) {
+					day = Math.floor(seconds / (60 * 60 * 24))
+					hour = Math.floor(seconds / (60 * 60)) - (day * 24)
+					minute = Math.floor(seconds / 60) - (day * 24 * 60) - (hour * 60)
+					second = Math.floor(seconds) - (day * 24 * 60 * 60) - (hour * 60 * 60) - (minute * 60)
+				} else {
+					this.timeUp()
+				}
+                if (day < 10) {
+                	day = '0' + day
+                }
+				if (hour < 10) {
+					hour = '0' + hour
+				}
+				if (minute < 10) {
+					minute = '0' + minute
+				}
+				if (second < 10) {
+					second = '0' + second
+				}
+                this.d = day
+				this.h = hour
+				this.i = minute
+				this.s = second
+			}
+		},
+
+	}
+</script>
+<style lang="scss">
+	$countdown-height:44upx;
+
+	.uni-countdown {
+		// padding: 2upx 0;
+		display: inline-flex;
+		flex-wrap: nowrap;
+		justify-content: center;
+
+		&__splitor {
+			justify-content: center;
+			// line-height: $countdown-height;
+			// padding: 0 5upx;
+            font-size: 24upx;
+		}
+
+		&__number {
+			// line-height: $countdown-height;
+			justify-content: center;
+			// height: $countdown-height;
+			// border-radius: $uni-border-radius-base;
+			margin: 0 5upx;
+			font-size: 24upx;
+			// border: 1px solid #000000;
+			font-size: 24upx;
+			// padding: 0 10upx;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/src/components/seckill/seckillTop.vue b/src/components/seckill/seckillTop.vue
new file mode 100644
index 0000000..103d59c
--- /dev/null
+++ b/src/components/seckill/seckillTop.vue
@@ -0,0 +1,83 @@
+<template>
+  <view class="seckillTop">
+    <img src="../../static/img/seckilltopbg.png" alt class="topbg" />
+    <view class="timelist">
+      <view v-for="(i,j) in list" :class="cutime==j?active:time" :key="j">
+        <view>{{i.ms_starttime}}</view>
+        <view class="event" style="font-size:24upx">{{j == 0?"开抢中":"未开始" }}</view>
+      </view>
+      <!-- <view :class="cutime==1?active:time">
+        <view>16:00</view>
+        <view class="event" style="font-size:24upx">开抢中</view>
+      </view>
+            <view :class="cutime==2?active:time">
+        <view>16:00</view>
+        <view class="event" style="font-size:24upx">开抢中</view>
+      </view>
+            <view :class="cutime==3?active:time">
+        <view>16:00</view>
+        <view class="event" style="font-size:24upx">开抢中</view>
+      </view>
+
+            <view :class="cutime==4?active:time">
+        <view>16:00</view>
+        <view class="event" style="font-size:24upx">开抢中</view>
+      </view>-->
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  name: "seckillTop",
+  data() {
+    return {
+      active: "active",
+      time: "time"
+    };
+  },
+  props: {
+    cutime: {
+      type: Number
+    },
+    list:{
+      type: Array
+    }
+  },
+  mounted() {
+    console.log(this.list, 221);
+  }
+};
+</script>
+
+<style lang="scss">
+.seckillTop {
+  .topbg {
+    height: 210upx;
+    width: 100%;
+    position: relative;
+    z-index: -1;
+  }
+  .timelist {
+    display: flex;
+    justify-content: space-around;
+    position: relative;
+    bottom: 143upx;
+    .time {
+      width: 96upx;
+      font-size: 40upx;
+      color: #e49299;
+      text-align: center;
+      .event {
+        font-size: 24upx;
+      }
+    }
+  }
+  .active {
+    width: 96upx;
+    font-size: 40upx;
+    color: white;
+    text-align: center;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/components/seckill/seckillad.vue b/src/components/seckill/seckillad.vue
new file mode 100644
index 0000000..7901c7d
--- /dev/null
+++ b/src/components/seckill/seckillad.vue
@@ -0,0 +1,28 @@
+<template>
+  <view class="seckillAd">
+    <img :src="picurl" alt="" class="pic">
+  </view>
+</template>
+
+<script>
+export default {
+  name:"seckillAd",
+  props:{
+    picurl:{
+      type:String
+    }
+  },
+  mounted(e){
+    console.log(this.picurl,"57448185")
+  }
+}
+</script>
+
+<style lang="scss">
+.seckillAd{
+    .pic{
+      width: 342upx;
+      height: 165upx;
+    }
+}
+</style>
\ No newline at end of file
diff --git a/src/components/seckill/seckillceshi.vue b/src/components/seckill/seckillceshi.vue
new file mode 100644
index 0000000..0215518
--- /dev/null
+++ b/src/components/seckill/seckillceshi.vue
@@ -0,0 +1,47 @@
+<template>
+  <view class="seckillceshi">
+    <swiper
+      class="swiper"
+      :indicator-dots="indicatorDots"
+      :autoplay="autoplay"
+      :duration="duration"
+      circular="true"
+      display-multiple-items="3"
+      @change="aa"
+    >
+      <swiper-item>
+        <view :class="a==0?'seckilltime':'seckilltime1'">A</view>
+      </swiper-item>
+      <swiper-item>
+        <view :class="a==1?'seckilltime':'seckilltime1'">B</view>
+      </swiper-item>
+      <swiper-item>
+        <view :class="a==2?'seckilltime':'seckilltime1'">C</view>
+      </swiper-item>
+      <swiper-item>
+        <view :class="a==3?'seckilltime':'seckilltime1'">D</view>
+      </swiper-item>
+    </swiper>
+  </view>
+</template>
+
+<script>
+export default {
+  name: "selectkillceshi",
+  data() {
+    return {
+      autoplay: false,
+      active: "active",
+      a: 0
+    };
+  },
+    methods: {
+    aa(a) {
+      this.a = a.detail.current;
+    }
+  }
+};
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/src/components/seckill/seckilldetailname.vue b/src/components/seckill/seckilldetailname.vue
new file mode 100644
index 0000000..400fc15
--- /dev/null
+++ b/src/components/seckill/seckilldetailname.vue
@@ -0,0 +1,98 @@
+<template>
+  <view class="seckillshopdetailname">
+    <view class="left">
+      <view class="left1">
+        <text class="icon">￥</text>
+        <text class="money">{{price}}</text>
+      </view>
+      <view class="right1">
+        <view class="yishou">已售{{yp_kp_bfb}}</view>
+        <view class="huaxian">￥{{price_y}}</view>
+      </view>
+    </view>
+    <view class="right">
+      <view class="ale">距离结束仅剩</view>
+      <view class="djs">
+        <countdown :day="time[0]" :hour="time[1]" :minute="time[2]" :second="time[3]" showDay=true></countdown>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+import countdown from "../../components/seckill/countdown";
+export default {
+  name: "seckillshopdetailname",
+  components: {
+    countdown
+  },
+  data(){
+    return {
+      time:[]
+    }
+  },
+  props:['price','price_y','yp_kp_bfb','times'],
+  watch:{
+    times(a){
+      console.log(a)
+      this.time = a
+    }
+  }
+};
+</script>
+
+<style lang="scss">
+.seckillshopdetailname {
+  width: 100vw;
+  height: 101upx;
+  background: url("../../static/img/seckillshopdetail.png");
+  background-size: 100% 100%;
+  // position: absolute;
+  // left: 0;
+  //   float: left;
+  display: flex;
+  justify-content: space-between;
+  .left {
+    width: 151upx;
+    margin-left: 28upx;
+    color: white;
+    line-height: 101upx;
+    display: flex;
+    .left1 {
+      height: 30upx;
+      .icon {
+        font-size: 30upx;
+      }
+      .money {
+        font-size: 41upx;
+      }
+    }
+    .right1 {
+      position: relative;
+      top: -12upx;
+      left: 10upx;
+      .yishou {
+        height: 20upx;
+        color: #fff600;
+        font-size: 18upx;
+      }
+      .huaxian {
+        width: 100upx;
+        font-size: 21upx;
+        text-decoration: line-through;
+      }
+    }
+  }
+  .right {
+    .ale {
+      color: #e1484e;
+      font-size: 22upx;
+      text-align: center;
+    }
+    height: 61rpx;
+    // margin: auto 0;
+    margin-top: 16rpx;
+    padding-right: 35upx;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/components/seckill/seckillshop.vue b/src/components/seckill/seckillshop.vue
new file mode 100644
index 0000000..affc649
--- /dev/null
+++ b/src/components/seckill/seckillshop.vue
@@ -0,0 +1,174 @@
+<template>
+  <view class="seckillshop">
+    <img :src="imgurl" alt class="pic" />
+    <view class="shopinfo">
+        <view>
+            <view class="shopname">{{shopname}}</view>
+      <view class="shopdesc">{{shopdesc}}</view>
+    <view class="tag">{{tag}}</view>
+        </view>
+      
+      <view>
+      
+        <view class="price">
+          <view class="money">
+            <text class="moneyicon">￥</text>
+            <text>{{price}}</text>
+          </view>
+          <view class="btn" >{{show == 0 ? '马上抢' : '待抢购'}}</view>
+        </view>
+        <view class="bottom">
+          <view class="huaxian">￥{{huaxian}}</view>
+          <view class="sale">
+            <text>已售{{sale}}</text>
+            <view class="schedule">
+              <view class="progress" :style="progress1"></view>
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  name: "seckillshop",
+  data(){
+    return {
+      progress1:"width:"+this.sale
+    }
+  },
+  props:{
+      imgurl:{
+          type:String
+      },
+      shopname:{
+          type:String
+      },
+      shopdesc:{
+          type:String
+      },
+      tag:{
+        type:String
+      },
+      price:{
+        type:Number
+      },
+      huaxian:{
+        type:Number
+      },
+      sale:{
+        type:String
+      },
+      show:{
+        
+      }
+  }
+};
+</script>
+
+<style lang="scss">
+.seckillshop {
+  width: 100%;
+  height: 225upx;
+  display: flex;
+  justify-content: space-between;
+  .pic {
+    width: 192upx;
+    height: 192upx;
+    margin-left: 11upx;
+  }
+  .shopinfo {
+    width: 475upx;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    margin-top:18upx;
+    margin-right: 49upx;
+    margin-bottom: 24upx;
+    .shopname {
+      color: #393939;
+      font-size: 26upx;
+      font-weight: 800;
+      text-align: center;
+    }
+    .shopdesc {
+      color: #e44a59;
+      font-size: 18upx;
+      text-indent: 28upx;
+    }
+    .tag {
+      width: 61upx;
+      height: 27upx;
+      background-color: #52a2de;
+      color: white;
+      line-height: 27upx;
+      text-align: center;
+      font-size: 16upx;
+      font-weight: bold;
+      margin-left: 21upx;
+    }
+    .price {
+      display: flex;
+      justify-content: space-between;
+      color: #ea2544;
+      font-size: 36upx;
+      margin-left: 18upx;
+      .money{
+          position: relative;
+          top: 25upx;
+      }
+      .moneyicon {
+        font-size: 19upx;
+      }
+      .btn {
+        width: 158upx;
+        height: 53upx;
+        font-size: 26upx;
+        color: white;
+        text-align: center;
+        line-height: 53upx;
+        background-color: #df3348;
+        border-radius: 27upx;
+        position: relative;
+        top: 10upx;
+        right:-15upx;
+      }
+    }
+    .bottom {
+      display: flex;
+      justify-content: space-between;
+      color: #666666;
+    //   margin-left: 23upx;
+    //   margin-top: 10upx;
+    position: relative;
+    left: 23upx;
+    top: 11upx;
+      .huaxian {
+        font-size: 18upx;
+        text-decoration: line-through;
+      }
+      .sale {
+        font-size: 20upx;
+        font-size: bold;
+        display: flex;
+        .schedule {
+          width: 158upx;
+          height: 15upx;
+          background-color: rgba(252, 233, 237, 1);
+          margin-top:10upx;
+          margin-right: 54upx;
+          margin-left: 7upx;
+          border-radius: 8upx;
+          .progress {
+            height: 100%;
+            background-color: rgba(236, 153, 163, 1);
+            border-radius: 8upx;
+          }
+        }
+      }
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/components/seckill/seckilltittle.vue b/src/components/seckill/seckilltittle.vue
new file mode 100644
index 0000000..0f48dc9
--- /dev/null
+++ b/src/components/seckill/seckilltittle.vue
@@ -0,0 +1,62 @@
+<template>
+  <view class="seckillTittle">
+    <view class="left">{{show == 0 ? '抢购中 先到先得哦':'未开始 请耐心等待'}}</view>
+    <view class="right">
+      <view class="text">{{show == 0 ? '据结束' : '待抢购'}}</view>
+      <view class="djs">
+           <countdown 
+    :hour="date[0]" 
+    :minute="date[1]" 
+    :second="date[2]"></countdown>
+      </view>
+   
+    </view>
+  </view>
+</template>
+
+<script>
+import countdown from "./countdown"
+export default {
+  name: "seckillTittle",
+  components:{
+    countdown
+  },
+  props:['date','show']
+};
+</script>
+
+<style lang="scss">
+.seckillTittle {
+  width: 702upx;
+  height: 39upx;
+  display: flex;
+  justify-content: space-between;
+  .left {
+    color: #333333;
+    font-size: 22upx;
+    font-weight: 800;
+  }
+  .right {
+    width: 254upox;
+    height: 39upx;
+    display: flex;
+    font-weight: 800;
+    line-height: 39upx;
+    .text {
+      width: 96upx;
+      height: 39upx;
+      background-color: #df3348;
+      color: white;
+      text-align: center;
+      font-size: 22upx;
+    }
+    .djs {
+      width: 158upx;
+      text-align: center;
+      color: #df3348;
+      font-size: 24upx;
+      background-color: #F9EBEA;
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/components/serchshaixuan/serchshaixuan.vue b/src/components/serchshaixuan/serchshaixuan.vue
new file mode 100644
index 0000000..0ef11f8
--- /dev/null
+++ b/src/components/serchshaixuan/serchshaixuan.vue
@@ -0,0 +1,464 @@
+<template>
+  <view>
+    <slot>
+      <view class="index-title">A</view>
+      <view class="c">
+        <serchshaixuanitem carname="劲浪/Focal"></serchshaixuanitem>
+        <serchshaixuanitem carname="劲浪/Focal"></serchshaixuanitem>
+      </view>
+      <view class="index-title">B</view>
+      <view class="c">
+        <serchshaixuanitem carname="劲浪/Focal"></serchshaixuanitem>
+        <serchshaixuanitem carname="劲浪/Focal"></serchshaixuanitem>
+        <serchshaixuanitem carname="劲浪/Focal"></serchshaixuanitem>
+      </view>
+      <view class="index-title">C</view>
+      <view class="c">
+        <serchshaixuanitem carname="劲浪/Focal"></serchshaixuanitem>
+        <serchshaixuanitem carname="劲浪/Focal"></serchshaixuanitem>
+        <serchshaixuanitem carname="劲浪/Focal"></serchshaixuanitem>
+        <serchshaixuanitem carname="劲浪/Focal"></serchshaixuanitem>
+      </view>
+      <view class="index-title">D</view>
+      <view class="c">
+        <serchshaixuanitem carname="劲浪/Focal"></serchshaixuanitem>
+        <serchshaixuanitem carname="劲浪/Focal"></serchshaixuanitem>
+      </view>
+      <view class="index-title">E</view>
+      <view class="c">
+        <serchshaixuanitem carname="劲浪/Focal"></serchshaixuanitem>
+        <serchshaixuanitem carname="劲浪/Focal"></serchshaixuanitem>
+      </view>
+      <view class="index-title">F</view>
+      <view class="c">
+        <serchshaixuanitem carname="劲浪/Focal"></serchshaixuanitem>
+        <serchshaixuanitem carname="劲浪/Focal"></serchshaixuanitem>
+      </view>
+      <view class="index-title">G</view>
+      <view class="c">
+        <serchshaixuanitem carname="劲浪/Focal"></serchshaixuanitem>
+        <serchshaixuanitem carname="劲浪/Focal"></serchshaixuanitem>
+      </view>
+      <view class="index-title">H</view>
+      <view class="c">
+        <serchshaixuanitem carname="劲浪/Focal"></serchshaixuanitem>
+        <serchshaixuanitem carname="劲浪/Focal"></serchshaixuanitem>
+      </view>
+      <view class="index-title">I</view>
+      <view class="c">
+        <serchshaixuanitem carname="劲浪/Focal"></serchshaixuanitem>
+        <serchshaixuanitem carname="劲浪/Focal"></serchshaixuanitem>
+      </view>
+      <view class="index-title">J</view>
+      <view class="c">
+        <serchshaixuanitem carname="劲浪/Focal"></serchshaixuanitem>
+        <serchshaixuanitem carname="劲浪/Focal"></serchshaixuanitem>
+      </view>
+      <view class="index-title">K</view>
+      <view class="c">
+        <serchshaixuanitem carname="劲浪/Focal"></serchshaixuanitem>
+        <serchshaixuanitem carname="劲浪/Focal"></serchshaixuanitem>
+      </view>
+      <view class="index-title">L</view>
+      <view class="c">
+        <view class="c">
+          <serchshaixuanitem carname="劲浪/Focal"></serchshaixuanitem>
+          <serchshaixuanitem carname="劲浪/Focal"></serchshaixuanitem>
+        </view>
+      </view>
+      <view class="index-title">M</view>
+      <view class="c">
+        <serchshaixuanitem carname="劲浪/Focal"></serchshaixuanitem>
+        <serchshaixuanitem carname="劲浪/Focal"></serchshaixuanitem>
+      </view>
+      <view class="index-title">N</view>
+      <view class="c">
+        <serchshaixuanitem carname="劲浪/Focal"></serchshaixuanitem>
+        <serchshaixuanitem carname="劲浪/Focal"></serchshaixuanitem>
+      </view>
+      <view class="index-title">O</view>
+      <view class="c">
+        <serchshaixuanitem carname="劲浪/Focal"></serchshaixuanitem>
+        <serchshaixuanitem carname="劲浪/Focal"></serchshaixuanitem>
+      </view>
+      <view class="index-title">P</view>
+      <view class="c">
+        <serchshaixuanitem carname="劲浪/Focal"></serchshaixuanitem>
+        <serchshaixuanitem carname="劲浪/Focal"></serchshaixuanitem>
+      </view>
+      <view class="index-title">Q</view>
+      <view class="c">
+        <serchshaixuanitem carname="劲浪/Focal"></serchshaixuanitem>
+        <serchshaixuanitem carname="劲浪/Focal"></serchshaixuanitem>
+      </view>
+      <view class="index-title">R</view>
+      <view class="c">
+        <serchshaixuanitem carname="劲浪/Focal"></serchshaixuanitem>
+        <serchshaixuanitem carname="劲浪/Focal"></serchshaixuanitem>
+      </view>
+      <view class="index-title">S</view>
+      <view class="c">
+        <serchshaixuanitem carname="劲浪/Focal"></serchshaixuanitem>
+        <serchshaixuanitem carname="劲浪/Focal"></serchshaixuanitem>
+      </view>
+      <view class="index-title">T</view>
+      <view class="c">
+        <serchshaixuanitem carname="劲浪/Focal"></serchshaixuanitem>
+        <serchshaixuanitem carname="劲浪/Focal"></serchshaixuanitem>
+      </view>
+      <view class="index-title">U</view>
+      <view class="c">
+        <serchshaixuanitem carname="劲浪/Focal"></serchshaixuanitem>
+        <serchshaixuanitem carname="劲浪/Focal"></serchshaixuanitem>
+      </view>
+      <view class="index-title">V</view>
+      <view class="c">
+        <serchshaixuanitem carname="劲浪/Focal"></serchshaixuanitem>
+        <serchshaixuanitem carname="劲浪/Focal"></serchshaixuanitem>
+      </view>
+      <view class="index-title">W</view>
+      <view class="c">
+        <serchshaixuanitem carname="劲浪/Focal"></serchshaixuanitem>
+        <serchshaixuanitem carname="劲浪/Focal"></serchshaixuanitem>
+      </view>
+      <view class="index-title">X</view>
+      <view class="c">
+        <serchshaixuanitem carname="劲浪/Focal"></serchshaixuanitem>
+        <serchshaixuanitem carname="劲浪/Focal"></serchshaixuanitem>
+      </view>
+      <view class="index-title">Y</view>
+      <view class="c">
+        <serchshaixuanitem carname="劲浪/Focal"></serchshaixuanitem>
+        <serchshaixuanitem carname="劲浪/Focal"></serchshaixuanitem>
+      </view>
+      <view class="index-title">Z</view>
+      <view class="c">
+        <serchshaixuanitem carname="劲浪/Focal"></serchshaixuanitem>
+        <serchshaixuanitem carname="劲浪/Focal"></serchshaixuanitem>
+      </view>
+    </slot>
+    <view @touchmove.stop="a" @touchstart.stop="b" class="i-index-fixed">
+      <view catchtap="handlerFixedTap" class="i-index-fixed-item">A</view>
+      <view catchtap="handlerFixedTap" class="i-index-fixed-item">B</view>
+      <view catchtap="handlerFixedTap" class="i-index-fixed-item">C</view>
+      <view catchtap="handlerFixedTap" class="i-index-fixed-item">B</view>
+      <view catchtap="handlerFixedTap" class="i-index-fixed-item">D</view>
+      <view catchtap="handlerFixedTap" class="i-index-fixed-item">E</view>
+      <view catchtap="handlerFixedTap" class="i-index-fixed-item">F</view>
+      <view catchtap="handlerFixedTap" class="i-index-fixed-item">G</view>
+      <view catchtap="handlerFixedTap" class="i-index-fixed-item">H</view>
+      <view catchtap="handlerFixedTap" class="i-index-fixed-item">I</view>
+      <view catchtap="handlerFixedTap" class="i-index-fixed-item">J</view>
+      <view catchtap="handlerFixedTap" class="i-index-fixed-item">K</view>
+      <view catchtap="handlerFixedTap" class="i-index-fixed-item">L</view>
+      <view catchtap="handlerFixedTap" class="i-index-fixed-item">M</view>
+      <view catchtap="handlerFixedTap" class="i-index-fixed-item">N</view>
+      <view catchtap="handlerFixedTap" class="i-index-fixed-item">O</view>
+      <view catchtap="handlerFixedTap" class="i-index-fixed-item">P</view>
+      <view catchtap="handlerFixedTap" class="i-index-fixed-item">Q</view>
+      <view catchtap="handlerFixedTap" class="i-index-fixed-item">R</view>
+      <view catchtap="handlerFixedTap" class="i-index-fixed-item">S</view>
+      <view catchtap="handlerFixedTap" class="i-index-fixed-item">T</view>
+      <view catchtap="handlerFixedTap" class="i-index-fixed-item">U</view>
+      <view catchtap="handlerFixedTap" class="i-index-fixed-item">V</view>
+      <view catchtap="handlerFixedTap" class="i-index-fixed-item">W</view>
+      <view catchtap="handlerFixedTap" class="i-index-fixed-item">X</view>
+      <view catchtap="handlerFixedTap" class="i-index-fixed-item">Y</view>
+      <view catchtap="handlerFixedTap" class="i-index-fixed-item">Z</view>
+    </view>
+  </view>
+</template>
+
+<script>
+import searchShuru from "../../components/search/searchShuru";
+import xzcxlistTitle from "../../components/xzcxlist/xzcxlist-title";
+import xzcxlistIcon from "../../components/xzcxlist/xzcxlist-icon";
+import xzcxlistIconList from "../../components/xzcxlist/xzcxlist-iconlist";
+import xzcxlistCars from "../../components/xzcxlist/xzcxlist-cars";
+import serchshaixuanitem from "../../components/serchshaixuan/serchshaixuanitem";
+export default {
+  name: "test",
+  components: {
+    searchShuru,
+    xzcxlistTitle,
+    xzcxlistIcon,
+    xzcxlistIconList,
+    xzcxlistCars,
+    serchshaixuanitem
+  },
+  data() {
+    return {
+      dange: 0,
+      height: "",
+      top: "",
+      dange: "",
+      rect: []
+    };
+  },
+  mounted: function() {
+    this.huoqu();
+  },
+  methods: {
+    a: function(a) {
+      console.log(a);
+      this.jisuan(a.touches[0].clientY - this.top);
+    },
+    b: function(a) {
+      console.log(a);
+      this.jisuan(a.touches[0].clientY - this.top);
+    },
+    huoqu() {
+      var query = uni.createSelectorQuery().in(this);
+      //选择id
+      var that = this;
+      query
+        .select(".i-index-fixed")
+        .boundingClientRect(rect => {
+          console.log(rect, 1);
+          if (rect == null) {
+            this.$nextTick(() => {
+              this.huoqu();
+            });
+          }
+
+          var dan = Math.floor(rect.height / 26);
+          console.log(dan, 123);
+
+          (that.height = rect.height), console.log(that.height);
+          (that.top = Math.floor(rect.top) - 6), (that.dange = dan);
+        })
+        .exec();
+      query
+        .selectAll(".index-title")
+        .boundingClientRect(rect => {
+          console.log(rect, 1);
+          this.rect = rect;
+        })
+        .exec();
+      // i-index-line
+    },
+    // c: function (a) {
+    //   console.log(a);
+    //   this.jisuan(a.target.offsetTop)
+    // },
+
+    jisuan: function(a) {
+      var c = Math.floor(a / this.dange);
+      console.log(c,1232333)
+      // console.log(Math.floor(a / this.data.dange))
+      var z = "";
+      switch (c) {
+        case 1:
+          z = "A";
+          break;
+        case 2:
+          z = "B";
+          break;
+        case 3:
+          z = "C";
+          break;
+        case 4:
+          z = "D";
+          break;
+        case 5:
+          z = "E";
+          break;
+        case 6:
+          z = "F";
+          break;
+        case 7:
+          z = "G";
+          break;
+        case 8:
+          z = "H";
+          break;
+        case 9:
+          z = "I";
+          break;
+        case 10:
+          z = "J";
+          break;
+        case 11:
+          z = "K";
+          break;
+        case 12:
+          z = "L";
+          break;
+        case 13:
+          z = "M";
+          break;
+        case 14:
+          z = "N";
+          break;
+        case 15:
+          z = "O";
+          break;
+        case 16:
+          z = "P";
+          break;
+        case 17:
+          z = "Q";
+          break;
+        case 18:
+          z = "R";
+          break;
+        case 19:
+          z = "S";
+          break;
+        case 20:
+          z = "T";
+          break;
+        case 21:
+          z = "U";
+          break;
+        case 22:
+          z = "V";
+          break;
+        case 23:
+          z = "W";
+          break;
+        case 24:
+          z = "X";
+          break;
+        case 25:
+          z = "Y";
+          break;
+        case 26:
+          z = "Z";
+          break;
+      }
+      var that = this;
+
+      uni.pageScrollTo({
+        duration: 0,
+        scrollTop: that.rect[c].top - 140
+      });
+
+      console.log(z);
+      if (z) {
+        wx.showToast({
+          title: z,
+
+          icon: "none",
+
+          duration: 2000 //持续的时间
+        });
+      }
+    }
+  }
+};
+</script>
+
+<style lang="scss">
+.serch {
+  position: relative;
+  top: 17upx;
+}
+.i-index {
+  width: 100%;
+  height: 100%;
+}
+
+.i-index-line {
+  width: 80%;
+  height: 2rpx;
+  background-color: #f7f7f7;
+  float: right;
+}
+
+.i-index-content {
+  background: #fff;
+  position: relative;
+  z-index: 1;
+  display: inline-block;
+  padding: 0 20rpx;
+}
+
+.i-index-fixed {
+  position: fixed;
+  right: -5upx;
+  top: 50%;
+  z-index: 10;
+  padding-left: 20rpx;
+  transform: translateY(-50%);
+}
+
+.i-index-fixed-item {
+  display: block;
+  height: 36rpx;
+  line-height: 36rpx;
+  padding: 0 10rpx;
+  text-align: center;
+  color: #595959;
+  font-size: 24rpx;
+  border-radius: 50%;
+}
+
+.i-index-fixed-item-current {
+  background: #2d8cf0;
+  color: #fff;
+}
+
+.i-index-tooltip {
+  position: fixed;
+  left: 50%;
+  top: 50%;
+  transform: translate3d(-50%, -50%, 0);
+  background: rgba(0, 0, 0, 0.7);
+  color: #fff;
+  font-size: 48rpx;
+  border-radius: 50%;
+  width: 160rpx;
+  height: 160rpx;
+  line-height: 160rpx;
+  text-align: center;
+}
+
+.local-position-content {
+  height: 160rpx;
+  padding-left: 40rpx;
+  display: flex;
+  align-items: center;
+  color: #999;
+  background: #fff;
+  font-size: 24rpx;
+}
+
+.local-position-content span {
+  font-size: 40rpx;
+  font-weight: bold;
+  color: #ff5344;
+  margin-right: 8rpx;
+}
+
+.index-title {
+  height: 70rpx;
+  line-height: 70rpx;
+  font-size: 26rpx;
+  padding-left: 40rpx;
+  color: #999;
+  background: #f6f6f6;
+  position: relative;
+  top: 32upx;
+}
+.c {
+  background: #fff;
+  width: 100%;
+  /* height: 140rpx; */
+  font-size: 32rpx;
+  /* padding-left: 40rpx; */
+  position: relative;
+  top: 44upx;
+}
+.c span {
+  width: 100%;
+  height: 70rpx;
+  line-height: 70rpx;
+}
+.b {
+  display: block;
+}
+.router-hover {
+  opacity: 1;
+}
+</style>
\ No newline at end of file
diff --git a/src/components/serchshaixuan/serchshaixuanitem.vue b/src/components/serchshaixuan/serchshaixuanitem.vue
new file mode 100644
index 0000000..63d6abc
--- /dev/null
+++ b/src/components/serchshaixuan/serchshaixuanitem.vue
@@ -0,0 +1,28 @@
+<template>
+    <view class="serchshaixuanitem">
+        {{carname}}
+    </view>
+</template>
+
+<script>
+export default {
+    name:"serchshiaxuanitem",
+    props:{
+        carname:{
+            type:String
+        }
+    }
+}
+</script>
+
+<style lang="scss">
+.serchshaixuanitem{
+    height:85upx;
+    width: 100%;
+    background-color:white;
+    line-height: 85upx;
+    text-indent:22upx;
+    color: #333333;
+    font-size:24upx;
+}
+</style>
\ No newline at end of file
diff --git a/src/components/shaixuan/shaixuan-choice1.vue b/src/components/shaixuan/shaixuan-choice1.vue
new file mode 100644
index 0000000..0e60511
--- /dev/null
+++ b/src/components/shaixuan/shaixuan-choice1.vue
@@ -0,0 +1,120 @@
+<template>
+  <view class="shaixuanChoice">
+    <view class="left">
+      <view @click="selected">
+        <img :src="pic" alt class="select" />
+        <text class="zi">置顶原配轮胎</text>
+      </view>
+    </view>
+    <view class="mid" @click="tj">
+      <text :class="midtext">推荐排序</text>
+      <img  :src="xiala" alt class="xiala" />
+    </view>
+    <view class="right" @click="shaixuan">
+      <text class="righttext">筛选</text>
+      <img src="../../static/img/shaixuan.png" alt class="xiala" />
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  name: "shaixuanChoice",
+  data() {
+    return {
+      pic: "../../static/img/select.png",
+      ifselect: false,
+      midtext: "midtext",
+      xiala:"../../static/img/xiala.png",
+      iftj:false,
+    };
+  },
+  methods: {
+    radioChange(e) {
+      console.log(e);
+      this.select = !e.detail.value;
+    },
+    selected() {
+      this.pic =
+        this.pic == "../../static/img/select.png"
+          ? "../../static/img/selected.png"
+          : "../../static/img/select.png";
+      this.ifselect = this.ifselect == false ? true : false;
+      console.log(this.ifselect);
+    },
+    tj(){
+      this.midtext=this.midtext=="midtext"?"midtext active":"midtext"
+      this.xiala=this.xiala=="../../static/img/xiala.png"?"../../static/img/xialared.png":"../../static/img/xiala.png"
+       this.iftj = this.iftj == false ? true : false;
+      this.$emit("tuijian",this.iftj)
+    },
+    shaixuan(){
+      this.$emit('ifsx',true)
+    }
+  }
+};
+</script>
+
+<style lang="scss">
+.shaixuanChoice {
+  width: 100%;
+  height: 78upx;
+  background-color: white;
+  display: flex;
+  justify-content: space-between;
+  border-top: 1upx solid #efefef;
+  .left {
+    width: 267upx;
+    text-align: center;
+    color: #545454;
+    font-size: 26upx;
+    line-height: 78upx;
+    .select {
+      width: 28upx;
+      height: 28upx;
+      margin: auto 0;
+      position: relative;
+      top: 5upx;
+    }
+    .zi {
+      margin-left: 22upx;
+    }
+  }
+  .mid {
+    width: 280upx;
+    height: 43upx;
+    margin: auto 0;
+    color: #545454;
+    border-left: 1upx solid #efefef;
+    border-right: 1upx solid #efefef;
+    text-align: center;
+    line-height: 43upx;
+    .midtext {
+      font-size: 26upx;
+    }
+    .xiala {
+      width: 24upx;
+      height: 14upx;
+      margin-left: 14upx;
+    }
+  }
+  .right {
+    width: 202upx;
+    line-height: 78upx;
+    color: #545454;
+    .righttext {
+      font-size: 26upx;
+      margin-left: 34upx;
+    }
+    .xiala {
+      width: 24upx;
+      height: 24upx;
+      margin-left: 25upx;
+      margin-top: 5upx;
+    }
+  }
+  .active {
+    color: #d35f79;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/components/shaixuan/shaixuan-choise.vue b/src/components/shaixuan/shaixuan-choise.vue
new file mode 100644
index 0000000..f2f9851
--- /dev/null
+++ b/src/components/shaixuan/shaixuan-choise.vue
@@ -0,0 +1,47 @@
+<template>
+  <view class="shaixuanChoice">
+      <view class="carname">江淮安驰-小公主</view>
+      <view class="xiala">
+          <img src="../../static/img/xiala.png" alt="" class="xiala1">
+      </view> 
+    <view class="carname">145/70 R12</view>
+        <view class="xiala">
+          <img src="../../static/img/xiala.png" alt="" class="xiala1">
+      </view> 
+  </view>
+</template>
+
+<script>
+export default {
+name:"shaixuanChoice"
+}
+</script>
+
+<style lang="scss">
+.shaixuanChoice{
+    width: 514upx;
+    height: 22upx;
+    margin: 0 auto;
+    display: flex;
+    justify-content: space-between;
+    margin-top: 20upx;
+    padding-bottom: 24upx;
+    .carname{
+        color: #545454;
+        font-size: 22upx;
+        line-height: 15upx;
+    }
+    .xiala{
+        width: 24upx;
+        height: 14upx;
+        position: relative;
+        top: -20upx;
+       
+     
+        .xiala1{
+            width: 100%;
+            height: 100%;
+        }
+    }
+}
+</style>
\ No newline at end of file
diff --git a/src/components/shaixuan/shaixuan-condition.vue b/src/components/shaixuan/shaixuan-condition.vue
new file mode 100644
index 0000000..fc2c6b2
--- /dev/null
+++ b/src/components/shaixuan/shaixuan-condition.vue
@@ -0,0 +1,468 @@
+<template>
+  <view class="box" v-if="ifcondition" @click="close">
+    <view class="shaixuanCondition">
+      <scroll-view :scroll-y="true" class="scroll-Y" @scroll="scroll" @click.stop="a">
+        <view class="top">
+          <view class="tittle">价格区间(元)</view>
+          <view class="btns">
+            <!-- <view class="btn">最低价</view> -->
+            <input type="text" class="btn" placeholder="最低价" v-model="zdj" />
+            <!-- <view class="line"> -->
+            <img src="../../static/img/shaixuanline.png" alt class="line" />
+            <!-- </view> -->
+            <!-- <view class="btn">最高价</view> -->
+            <input type="text" class="btn" placeholder="最高价"  v-model="zgj"/>
+          </view>
+        </view>
+        <view class="item1">
+          <view class="tittle">品牌</view>
+          <view @click.stop="xl">
+            <img src="../../static/img/xiala.png" alt class="xiala" />
+          </view>
+          <view class="pinpai">
+            <!-- <view class="pinpaiitem" @click="selected">
+              <img src="../../static/img/pinpai.png" alt class="pinpai1" />
+              <view :class="select">倍耐力/Pirelli</view>
+            </view>-->
+            <view class="pinpaiitem" @click="selected" data-key="0">
+              <img :src="pinpai[0].img" alt class="pinpai1" />
+              <view :class="select[0]">{{pinpai[0].desc}}</view>
+            </view>
+            <view class="pinpaiitem" @click="selected" data-key="1">
+              <img :src="pinpai[1].img" alt class="pinpai1" />
+              <view :class="select[1]">{{pinpai[1].desc}}</view>
+            </view>
+            <view class="pinpaiitem" @click="selected" data-key="2">
+              <img :src="pinpai[2].img" alt class="pinpai1" />
+              <view :class="select[2]">{{pinpai[2].desc}}</view>
+            </view>
+            <view class="pinpai" v-if="ifxl">
+              <view
+                class="pinpaiitem"
+                @click="selected"
+                v-for="(item,index) in pinpai1"
+                :key="item.id"
+                :data-key="index+3"
+              >
+                <img :src="item.img" alt class="pinpai1" />
+                <view :class="select[index+3]">{{item.desc}}</view>
+              </view>
+            </view>
+          </view>
+          <!-- <view class="line"></view> -->
+        </view>
+
+        <view class="item2">
+          <view class="tittle">花纹性能</view>
+          <view @click="xlck">
+            <img src="../../static/img/xiala.png" alt class="xiala" />
+          </view>
+          <view class="xingneng1">
+            <view :class="xzxn[0]" @click="xingnengxz" data-key="0">{{xingneng[0].desc}}</view>
+            <view :class="xzxn[1]" @click="xingnengxz" data-key="1">{{xingneng[1].desc}}</view>
+            <view :class="xzxn[2]" @click="xingnengxz" data-key="2">{{xingneng[2].desc}}</view>
+            <view class="xingneng2" v-if="ifxlck">
+              <view
+                :class="xzxn[index+3]"
+                v-for="(item,index) in xingneng1"
+                :key="item.id"
+                @click="xingnengxz"
+                :data-key="index+3"
+              >操控</view>
+              <!-- <view class="xingneng">操控</view>
+              <view class="xingneng">操控</view>
+              <view class="xingneng">操控</view>-->
+            </view>
+
+            <!-- </view> -->
+            <!-- </view> -->
+            <!-- <view class="line"></view> -->
+          </view>
+
+          <view class="item2">
+            <view class="tittle">速度级别</view>
+            <view @click="xlsd">
+              <img src="../../static/img/xiala.png" alt class="xiala" />
+            </view>
+            <view class="xingneng1">
+              <view :class="suduxz[0]" @click="speed" data-key="0">{{sudu[0].desc}}</view>
+              <view :class="suduxz[1]" @click="speed" data-key="1">{{sudu[1].desc}}</view>
+              <view :class="suduxz[2]" @click="speed" data-key="2">{{sudu[2].desc}}</view>
+              <view class="xingneng2" v-if="ifxlsd">
+                <view
+                  :class="suduxz[index+3]"
+                  v-for="(item,index) in sudu1"
+                  :key="item.id"
+                  @click="speed"
+                  :data-key="index+3"
+                >{{item.desc}}</view>
+                <!-- <view class="xingneng">H</view>
+                <view class="xingneng">Q</view>
+                <view class="xingneng">M</view>-->
+              </view>
+            </view>
+          </view>
+          <!-- <view class="line"></view> -->
+        </view>
+
+        <view class="switch">
+          <view class="left">仅查看防爆胎</view>
+          <view class="right">
+            <switch :checked="switch1" @change="switch1Change" style="transform:scale(0.9)" />
+          </view>
+        </view>
+        <view class="line"></view>
+        <view class="switch">
+          <view class="left">仅查看雪地胎</view>
+          <view class="right">
+            <switch :checked="switch2" @change="switch2Change" style="transform:scale(0.9)" />
+          </view>
+        </view>
+        <view class="btns">
+          <view class="btn1" @click="reset">重置</view>
+          <view class="btn1 btn2">确定</view>
+        </view>
+      </scroll-view>
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  name: "shaixuanCondition",
+  data() {
+    return {
+      switch1: false,
+      switch2: false,
+      ifxl: false,
+      ifxlck: false,
+      ifxlsd: false,
+      select: [],
+      pinpai: [
+        { id: 1, img: "../../static/img/pinpai.png", desc: "倍耐力/Pirelli" },
+        { id: 2, img: "../../static/img/pinpai.png", desc: "倍耐力/Pirelli" },
+        { id: 3, img: "../../static/img/pinpai.png", desc: "倍耐力/Pirelli" },
+        { id: 4, img: "../../static/img/pinpai.png", desc: "倍耐力/Pirelli" },
+        { id: 5, img: "../../static/img/pinpai.png", desc: "倍耐力/Pirelli" },
+        { id: 6, img: "../../static/img/pinpai.png", desc: "倍耐力/Pirelli" }
+      ],
+      pinpai1: [],
+      xingneng: [
+        { id: 1, desc: "操控" },
+        { id: 2, desc: "操控" },
+        { id: 3, desc: "操控" },
+        { id: 4, desc: "操控" },
+        { id: 5, desc: "操控" },
+        { id: 6, desc: "操控" }
+      ],
+      xingneng1: [],
+      xzxn: [],
+      sudu: [
+        { id: 1, desc: "Q" },
+        { id: 2, desc: "W" },
+        { id: 3, desc: "E" },
+        { id: 4, desc: "R" },
+        { id: 5, desc: "M" },
+        { id: 6, desc: "S" }
+      ],
+      sudu1: [],
+      suduxz: [],
+      zgj:"",
+      zdj:""
+    };
+  },
+  mounted() {
+    this.pinpai1 = this.pinpai.slice(3, this.pinpai.length);
+    this.xingneng1 = this.xingneng.slice(3, this.xingneng.length);
+    this.sudu1 = this.sudu.slice(3, this.sudu.length);
+    for (var i in this.pinpai) {
+      this.select.push("desc");
+    }
+    for (var i in this.xingneng) {
+      this.xzxn.push("xingneng");
+    }
+    for (var i in this.sudu) {
+      this.suduxz.push("xingneng");
+    }
+    console.log(this.suduxz);
+  },
+  props: {
+    ifcondition: {
+      type: Boolean
+    }
+  },
+  methods: {
+    switch1Change(e) {
+      this.switch1 = e.detail.value;
+    },
+    switch2Change(e) {
+      this.switch2 = e.detail.value;
+    },
+    xl() {
+      this.ifxl = this.ifxl == false ? true : false;
+    },
+    xlck() {
+      console.log(111);
+      this.ifxlck = this.ifxlck == false ? true : false;
+    },
+    xlsd() {
+      this.ifxlsd = this.ifxlsd == false ? true : false;
+    },
+    close() {
+      console.log(7946);
+      this.$emit("condition", false);
+    },
+    scroll() {},
+    a() {},
+    selected(e) {
+      this.select = [];
+      console.log(e.currentTarget.dataset.key);
+      for (var i in this.pinpai) {
+        this.select.push("desc");
+      }
+      this.select[e.currentTarget.dataset.key] =
+        this.select[e.currentTarget.dataset.key] == "desc" ? "active" : "desc";
+      // this.select = this.select == "desc" ? "active" : "desc";
+    },
+    xingnengxz(e) {
+      this.xzxn = [];
+      console.log(e.currentTarget.dataset.key);
+      for (var i in this.pinpai) {
+        this.xzxn.push("xingneng");
+      }
+      this.xzxn[e.currentTarget.dataset.key] =
+        this.xzxn[e.currentTarget.dataset.key] == "xingneng"
+          ? "xingnengxz"
+          : "xingneng";
+      // this.select = this.select == "desc" ? "active" : "desc";
+    },
+    speed(e) {
+      this.suduxz = [];
+      console.log(e.currentTarget.dataset.key);
+      for (var i in this.pinpai) {
+        this.suduxz.push("xingneng");
+      }
+      this.suduxz[e.currentTarget.dataset.key] =
+        this.suduxz[e.currentTarget.dataset.key] == "xingneng"
+          ? "xingnengxz"
+          : "xingneng";
+      // this.select = this.select == "desc" ? "active" : "desc";
+    },
+    reset() {
+      this.switch1 = false;
+      this.switch2 = false;
+      this.select=[];
+      this.xzxn=[];
+      this.suduxz=[];
+      this.zgj="",
+      this.zdj=""
+      for (var i in this.pinpai) {
+        this.select.push("desc");
+      }
+      for (var i in this.xingneng) {
+        this.xzxn.push("xingneng");
+      }
+      for (var i in this.sudu) {
+        this.suduxz.push("xingneng");
+      }
+    }
+  }
+};
+</script>
+
+<style lang="scss">
+.box {
+  width: 100%;
+  height: 100vh;
+  position: absolute;
+  top: 0upx;
+  z-index: 999;
+  background-color: rgba(119, 119, 119, 0.08);
+}
+.shaixuanCondition {
+  width: 601upx;
+  height: 100vh;
+  background-color: white;
+  position: relative;
+  right: 0;
+  top: 220upx;
+  z-index: 999;
+  float: right;
+  .tittle {
+    font-size: 26upx;
+    text-indent: 39upx;
+    margin-top: 32upx;
+    margin-bottom: 41upx;
+  }
+  .top {
+    height: 177upx;
+    border-bottom: 2upx solid #dadada;
+
+    .btns {
+      display: flex;
+      justify-content: space-around;
+      .btn {
+        width: 219upx;
+        height: 56upx;
+        color: #666666;
+        font-size: 26upx;
+        text-align: center;
+        line-height: 56upx;
+        background: rgba(248, 248, 248, 1);
+        border: 2upx solid rgba(218, 218, 218, 1);
+      }
+      .line {
+        width: 31upx;
+        height: 4upx;
+        .line1 {
+          width: 100%;
+          height: 100%;
+        }
+      }
+    }
+  }
+  .item1 {
+    // height: 236upx;
+    border-bottom: 2upx solid #dadada;
+    .xiala {
+      width: 30upx;
+      height: 16upx;
+      float: right;
+      position: relative;
+      top: -60upx;
+      right: 34upx;
+    }
+    .line {
+      width: 100%;
+      height: 2upx;
+      position: relative;
+      top: -15upx;
+      background-color: #dadada;
+    }
+    .pinpai {
+      width: 100%;
+      display: flex;
+      flex-wrap: wrap;
+      justify-content: space-around;
+      position: relative;
+      top: 4upx;
+      .pinpaiitem {
+        width: 166upx;
+        height: 102upx;
+        margin-bottom: 30upx;
+        .pinpai1 {
+          width: 166upx;
+          height: 72upx;
+        }
+        .desc {
+          color: #999999;
+          font-size: 20upx;
+          text-align: center;
+        }
+        .active {
+          color: #dc3547;
+          font-size: 20upx;
+          text-align: center;
+        }
+      }
+    }
+  }
+  .item2 {
+    // height: 183upx;
+    border-bottom: 2upx solid #dadada;
+    .xiala {
+      width: 30upx;
+      height: 16upx;
+      float: right;
+      position: relative;
+      top: -60upx;
+      right: 34upx;
+    }
+  }
+  .xingneng {
+    width: 161upx;
+    height: 61upx;
+    color: #777777;
+    font-size: 30upx;
+    text-align: center;
+    line-height: 61upx;
+    margin-bottom: 25upx;
+    border: 1upx solid #dadada;
+  }
+  .switch {
+    height: 126upx;
+    line-height: 126upx;
+    display: flex;
+    justify-content: space-around;
+    .left {
+      color: #000000;
+      font-size: 26upx;
+    }
+  }
+  .line {
+    width: 100%;
+    height: 2upx;
+    background-color: #dadada;
+  }
+  .btns {
+    display: flex;
+    justify-content: center;
+    .btn1 {
+      width: 300upx;
+      height: 108upx;
+      border: 2upx solid #eeeeee;
+      color: #666666;
+      font-size: 30upx;
+      margin-top: 35upx;
+      line-height: 108upx;
+      text-align: center;
+    }
+    .btn2 {
+      background-color: #dc3547;
+      color: white;
+    }
+  }
+  .xingneng1 {
+    // position: relative;
+    // top:12upx;
+    display: flex;
+    justify-content: space-around;
+    flex-wrap: wrap;
+  }
+  .scroll-Y {
+    height: 1100upx;
+  }
+  .xingneng2 {
+    width: 100%;
+    margin-left: 5upx;
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: space-around;
+    .xingneng {
+      width: 161upx;
+      height: 61upx;
+      color: #777777;
+      font-size: 30upx;
+      text-align: center;
+      line-height: 61upx;
+      margin-bottom: 25upx;
+      border: 1upx solid #dadada;
+      margin-right: 5upx;
+      // margin-left: 10upx;
+    }
+  }
+  .xingnengxz {
+    width: 161upx;
+    height: 61upx;
+    color: white;
+    font-size: 30upx;
+    text-align: center;
+    line-height: 61upx;
+    margin-bottom: 25upx;
+    border: 1upx solid #dadada;
+    margin-right: 5upx;
+    background-color: #dc3547;
+    // margin-left: 10upx;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/components/shaixuan/shaixuan-null.vue b/src/components/shaixuan/shaixuan-null.vue
new file mode 100644
index 0000000..6af26cd
--- /dev/null
+++ b/src/components/shaixuan/shaixuan-null.vue
@@ -0,0 +1,31 @@
+<template>
+    <view class="shaixuannull">
+        <img src="../../static/img/shaixuannull.png" alt="" class="null">
+        <view class="desc">没有符合当前筛选条件的轮胎</view>
+    </view>
+</template>
+
+<script>
+export default {
+    name:"shaixuannull"
+}
+</script>
+
+<style lang="scss">
+.shaixuannull{
+    width: 750upx;
+    .null{
+        width: 276upx;
+        height: 332upx;
+        margin: 0 auto;
+        margin-left: 236upx;
+        margin-top: 123upx;
+    }
+    .desc{
+        color: #999999;
+        font-size: 24upx;
+        text-align:center;
+        margin-top: 61upx;
+    }
+}
+</style>
\ No newline at end of file
diff --git a/src/components/shaixuan/shaixuan-top.vue b/src/components/shaixuan/shaixuan-top.vue
new file mode 100644
index 0000000..23e6330
--- /dev/null
+++ b/src/components/shaixuan/shaixuan-top.vue
@@ -0,0 +1,21 @@
+<template>
+  <view class="shaixuanTop">145/70R12</view>
+</template>
+
+<script>
+export default {
+  name: "shaixuanTop"
+};
+</script>
+
+<style lang="scss">
+.shaixuanTop {
+  height: 167upx;
+  width: 100%;
+  background-color: white;
+  text-align: center;
+  line-height: 176upx;
+  color: #222222;
+  font-size: 37upx;
+}
+</style>
\ No newline at end of file
diff --git a/src/components/shaixuan/shaixuantj.vue b/src/components/shaixuan/shaixuantj.vue
new file mode 100644
index 0000000..a85c8d9
--- /dev/null
+++ b/src/components/shaixuan/shaixuantj.vue
@@ -0,0 +1,54 @@
+<template>
+  <view class="box" v-if="iftj" v-on:click="off">
+    <view class="item">推荐排序</view>
+    <view class="line"></view>
+    <view class="item">销量由低到高</view>
+     <view class="line"></view>
+    <view class="item">价格由低到高</view>
+     <view class="line"></view>
+    <view class="item">价格由高到低</view>
+  </view>
+</template>
+
+<script>
+export default {
+  name: "shaixuantj",
+  props:{
+      iftj:{
+          type:Boolean,
+      }
+  },
+  methods:{
+      off(){
+          this.iftj=this.iftj==false?true:false
+          this.$emit("tuijian",this.iftj)
+      }
+  }
+};
+</script>
+
+<style lang="scss">
+.box {
+  width: 100%;
+  height: 82vh;
+//   position: absolute;
+//   top: 0;
+  background-color: rgba(119, 119, 119, 0.3);
+
+}
+  .item {
+    width: 100%;
+    height: 85upx;
+    background-color: white;
+    color: #333333;
+    font-size:24upx; 
+    line-height: 85upx;
+    text-indent: 34upx;
+  }
+  .line {
+    width: 696upx;
+    height: 1upx;
+    margin:auto 0;
+    background: rgba(238, 238, 238, 1);
+  }
+</style>
\ No newline at end of file
diff --git a/src/components/shopdetail/shopdetai-allcomments.vue b/src/components/shopdetail/shopdetai-allcomments.vue
new file mode 100644
index 0000000..eb97e84
--- /dev/null
+++ b/src/components/shopdetail/shopdetai-allcomments.vue
@@ -0,0 +1,38 @@
+<template>
+  <view class="shopdetailAllcomments" @click="allcomments">
+      查看全部评价（99+)
+  </view>
+</template>
+
+<script>
+export default {
+name:"shopdetailAllcomments",
+props:{
+  num:{
+    type:Number
+  },
+  shopid:{
+    type:Number
+  }
+},
+methods:{
+  allcomments(){  
+    console.log(this.shopid)
+    uni.navigateTo({
+      url:"/pages/assess/assess?shopid="+this.shopid
+    })
+  }
+}
+}
+</script>
+
+<style lang="scss">
+.shopdetailAllcomments{
+    height: 95upx;
+    width: 100%;
+    text-align: center;
+    color: #686868;
+    font-size: 30upx;
+    line-height: 95upx;
+}
+</style>
\ No newline at end of file
diff --git a/src/components/shopdetail/shopdetail-attr.vue b/src/components/shopdetail/shopdetail-attr.vue
new file mode 100644
index 0000000..b54e63d
--- /dev/null
+++ b/src/components/shopdetail/shopdetail-attr.vue
@@ -0,0 +1,42 @@
+<template>
+  <view class="shopdetailAttr">
+      <view class="left">{{left}}</view>
+      <view class="right">{{right}}</view>
+  </view>
+</template>
+
+<script>
+export default {
+name:"shopdetailAttr",
+props:{
+    left:{
+        type:String
+    },
+    right:{
+        type:String
+    }
+}
+}
+</script>
+
+<style lang="scss">
+.shopdetailAttr{
+    height:84upx;
+    display: flex;
+    font-size: 22upx;
+    border:1upx solid rgba(222,222,222,1);
+    .left{
+        width: 204upx;
+        height: 100%;
+        background-color: #F7F7F7;
+        line-height:84upx;
+        text-align: center;
+        color: #888888;
+    }
+    .right{
+           line-height:84upx;
+        text-align: center;
+        text-indent:30upx;
+    }
+}
+</style>
\ No newline at end of file
diff --git a/src/components/shopdetail/shopdetail-bottom.vue b/src/components/shopdetail/shopdetail-bottom.vue
new file mode 100644
index 0000000..9fef1b0
--- /dev/null
+++ b/src/components/shopdetail/shopdetail-bottom.vue
@@ -0,0 +1,98 @@
+<template>
+  <view class="shopdetailbottom">
+      <!-- <view class="item">
+           <img src="../../static/img/phone.png" alt="" class="itempic">
+           <view>电话咨询</view>
+      </view>
+       <view class="item">
+           <img src="../../static/img/kefu.png" alt="" class="itempic">
+           <view>在线客服</view>
+      </view> -->
+       <!-- <view class="item">
+           <img src="../../static/img/shoucang.png" alt="" class="itempic">
+           <view>收藏</view>
+      </view> -->
+       <view class="btn2" @click="buy" v-if="shoptype==1">加入购物车</view>
+      <view class="btn1" @click="buy" v-if="shoptype==1">立即购买</view>
+       <view class="btn3" @click="buy" v-else>立即购买</view>
+  </view>
+</template>
+
+<script>
+
+export default {
+    name:"shopdetailbottom",
+    props:{
+        shoptype:{
+            type:Number
+
+        }
+    },
+    methods:{
+        buy(){
+            this.$emit('buy',true)
+        },
+        gwc(){
+            // this.$emit("gwc",true)
+            console.log(this.shopid,this.shoptype)
+
+        }
+    }
+}
+</script>
+
+<style lang="scss">
+.shopdetailbottom{
+    height: 129upx;
+    width:100%;
+    background-color: white;
+    display: flex;
+    justify-content:space-around;
+    position: fixed;
+    bottom: 0;
+    .item{
+        // width: 76upx;
+        height: 76upx;
+        text-align: center;
+        color: #666666;
+        font-size: 20upx;
+        margin: auto 0;
+        .itempic{
+            width: 49upx;
+            height: 49upx;
+            margin: 0 auto;
+        }
+    }
+    .btn1{
+        width: 352upx;
+        height: 83upx;
+        background-color: #DE3548;
+        color: white;
+        font-size: 30upx;
+        line-height: 83upx;
+        text-align: center;
+        margin: auto 0;
+    }
+    .btn2{
+         width: 325upx;
+      height: 72upx;
+      border: 1upx solid #de3449;
+      margin: auto 0;
+      font-size: 28upx;
+      color: #de3449;
+      line-height: 72upx;
+      text-align: center;
+    }
+        .btn3 {
+      width: 600upx;
+      height: 72upx;
+      background-color: #de3449;
+      // border:1upx solid #DE3449;
+      margin: auto 0;
+      font-size: 28upx;
+      color: white;
+      line-height: 72upx;
+      text-align: center;
+    }
+}
+</style>
\ No newline at end of file
diff --git a/src/components/shopdetail/shopdetail-btn.vue b/src/components/shopdetail/shopdetail-btn.vue
new file mode 100644
index 0000000..bcd4ddb
--- /dev/null
+++ b/src/components/shopdetail/shopdetail-btn.vue
@@ -0,0 +1,49 @@
+<template>
+  <view class="shopdetailBtn">
+    <view class="btn1" v-if="ifsp">{{btn1}}</view>
+    <view class="btn2" v-else>{{btn1}}</view>
+  </view>
+</template>
+
+<script>
+export default {
+  name: "shopdetailBtn",
+  props: {
+    ifsp: {
+      type: Boolean
+    },
+    btn1: {
+      type: String
+    }
+  },
+  data() {
+    return {
+    };
+  },
+};
+</script>
+
+<style lang="scss">
+.shopdetailBtn {
+  .btn1 {
+    width: 95upx;
+    height: 44upx;
+    font-size: 24upx;
+    color: white;
+    text-align: center;
+    border-radius: 22upx;
+    background-color: #df3348;
+    line-height: 44upx;
+  }
+  .btn2 {
+    width: 95upx;
+    height: 44upx;
+    font-size: 24upx;
+    color: #444444;
+    text-align: center;
+    border-radius: 22upx;
+    line-height: 44upx;
+    border: 2upx solid rgba(247, 239, 239, 1);
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/components/shopdetail/shopdetail-choosesize.vue b/src/components/shopdetail/shopdetail-choosesize.vue
new file mode 100644
index 0000000..9d7d12b
--- /dev/null
+++ b/src/components/shopdetail/shopdetail-choosesize.vue
@@ -0,0 +1,554 @@
+<template>
+  <view class="box" v-if="ifchoose" @click="close">
+    <view class="choosesize" @click.stop="a">
+      <scroll-view :scroll-y="true" class="scroll-Y" @scroll="scroll" @click.stop="a">
+        <view class="top">
+          <!-- <view> -->
+          <img :src="shoppic" alt class="shoppic" />
+          <view class="btn1" v-if="renshu!=0">{{renshu}}人团</view>
+          <view class="price">
+            <view class="money">￥{{price}}</view>
+            <view class="huaxian">￥{{huaxian}}</view>
+          </view>
+        </view>
+
+        <!-- </view> -->
+        <view class="line"></view>
+        <view v-for="(i,j) in tags" :key="j">
+          <view class="title">{{i.guige_name}}</view>
+          <view class="tags">
+            <view
+              v-for="(item,key) in i.guige_val_list"
+              :key="key"
+              :class="tag[j][key]"
+              @click="xztag(j,key)"
+            >{{item}}</view>
+            <!-- <view :class="tag[1]" @click="xztag" data-no="1">儒雅黑</view>
+        <view :class="tag[2]" @click="xztag" data-no="2">儒雅黑</view>
+        <view :class="tag[3]" @click="xztag" data-no="3">儒雅黑</view>
+        <view :class="tag[4]" @click="xztag" data-no="4">儒雅黑</view>
+            <view :class="tag[5]" @click="xztag" data-no="5">儒雅黑</view>-->
+          </view>
+        </view>
+
+        <view class="number">
+          <view class="title">
+            <text class="zi">数量</text>
+          </view>
+          <view class="numbox">
+            <view class="num">
+              <view class="reverse" @click="reverse">
+                <img src="../../static/img/reverse.png" alt class="icon" />
+              </view>
+              <view class="shuliang">{{num}}</view>
+              <view class="reverse" @click="add">
+                <img src="../../static/img/add1.png" alt class="icon1" />
+              </view>
+            </view>
+          </view>
+        </view>
+        
+      </scroll-view>
+      <view class="btns" v-if="shoptype==0">
+          <view class="btn1" @click="gwc">加入购物车</view>
+          <view class="btn2" @click="buy">立即购买</view>
+        </view>
+          <view class="btns" v-else-if="shoptype==2">
+          <view class="btn3" @click="buy1">立即购买</view>
+        </view>
+          <view class="btns" v-else-if="shoptype==4">
+          <view class="btn3" @click="buy1">立即购买</view>
+        </view>
+        <view class="btns" v-else>
+          <view class="btn3" @click="buy">立即购买</view>
+        </view>
+    </view>
+  </view>
+</template>
+
+<script>
+import { requestP } from "../../static/js/request";
+export default {
+  name: "choosesize",
+  data() {
+    return {
+      tag: [],
+      num: 1,
+      typestr: []
+    };
+  },
+  props: {
+    ifchoose: {
+      type: Boolean,
+      default: false
+    },
+    renshu: {
+      type: Number
+    },
+    shoppic: {
+      type: String
+    },
+    price: {
+      type: Number
+    },
+    huaxian: {
+      type: Number
+    },
+    tags: {
+      // type:Array
+    },
+    shopid: {
+      type: Number
+    },
+    shoptype: {
+      type: Number
+    },
+    msid: {
+      type: Number
+    },
+    max: {
+      type: Number
+    },
+    kucun: {
+      type: Number
+    },
+    ptid:{
+      type:Number
+    },
+    ptorderid:{
+      type:Number
+    }
+  },
+  methods: {
+    a() {},
+    xztag(e, f) {
+      for (let i in this.tags) {
+        if (e == i) {
+          for (let j in this.tags[i].guige_val_list) {
+            // this.tag[i][j] = j == f ? "tag1" : "tag"
+            this.$set(this.tag[i], j, j == f ? "tag1" : "tag");
+            //    this.$set(this.typestr[i],j-1,this.tags[e].guige_name)
+            // this.$set(this.typestr[i],j,this.tags[e].guige_val_list[f])
+          }
+          for (let m = 0; m < this.typestr.length; m++) {
+            if (e == m) {
+              // console.log("qwer")
+              // console.log(e,i,m)
+              this.$set(this.typestr[i], 0, this.tags[i].guige_name + ":");
+              this.$set(this.typestr[i], 1, this.tags[e].guige_val_list[f]);
+            }
+          }
+        }
+      }
+
+      // console.log(this.typestr.join(','),2000)
+      this.$emit("tagchange", this.typestr.join(","));
+    },
+    reverse() {
+      if (this.num <= 1) {
+        this.num = 1;
+      } else {
+        this.num = this.num - 1;
+      }
+    },
+    add() {
+      if (this.shoptype == 0) {
+        console.log(this.kucun, "kucun");
+        if (this.num >= this.kucun) {
+          this.num = this.kucun;
+        } else {
+          this.num = this.num + 1;
+        }
+      } else if (this.shoptype == 1) {
+        console.log(this.max, "max");
+        if (this.num >= this.max) {
+          this.num = this.max;
+        } else {
+          this.num = this.num + 1;
+        }
+      }else if (this.shoptype == 2) {
+        console.log(this.kucun, "kucun");
+        if (this.num >= this.kucun) {
+          this.num = this.kucun;
+        } else {
+          this.num = this.num + 1;
+        }
+      }
+      // this.num = this.num + 1;
+    },
+    close() {
+      this.$emit("close", false);
+    },
+    scroll() {},
+    gwc() {
+      if (this.shoptype == 0) {
+        requestP({
+          url: "shop_cart/add_cart",
+          data: {
+            goods_id: this.shopid,
+            goods_guige: this.typestr.join(","),
+            num: this.num
+          }
+        }).then(res => {
+          console.log(res);
+          if (res.data.code == 1) {
+            uni.showToast({
+              title: "添加成功",
+              icon: "success",
+              duration: 2000
+            });
+            uni.navigateTo({
+              url: "/pages/shopping/shopping"
+            });
+          }
+        });
+        console.log(this.shopid);
+      }
+    },
+    buy(){
+
+      // console.log(this.typestr.join(","),"jiesuan");
+      if (this.shoptype == 0) {
+        requestP({
+          url: "pay/pay_goods",
+          data: {
+            goods_id: this.shopid,
+            num: this.num
+          }
+        }).then(res => {
+          console.log(res);
+          if (res.data.code) {
+            uni.setStorageSync("ordersubinfo", res.data);
+            uni.navigateTo({
+              url:
+                "/pages/order-sub/order-sub?guige=" +
+                this.typestr.join(",") +
+                "&shopid=" +
+                this.shopid +
+                "&num=" +
+                this.num+"&shoptype=0"
+            });
+          }
+          console.log(res.data.code, "code");
+        });
+      } else if (this.shoptype == 1) {
+        requestP({
+          url: "pay/pay_goods",
+          data: {
+            goods_ms_id: this.msid,
+            num: this.num
+          }
+        }).then(res => {
+          console.log(res);
+          if (res.data.code) {
+            uni.setStorageSync("ordersubinfo", res.data);
+            uni.navigateTo({
+              url:
+                "/pages/order-sub/order-sub?guige=" +
+                this.typestr.join(",") +
+                "&msid=" +
+                this.msid +
+                "&num=" +
+                this.num+"&shoptype=1"
+            });
+          }
+          console.log(res.data.code, "code");
+        });
+      }
+
+      console.log(this.shopid, this.num);
+    },
+
+    buy1(){
+      console.log("qqweqd")
+      if(this.shoptype==2){
+          requestP({
+          url: "pay/pay_goods_pintuan",
+          data: {
+            goods_pt_id: this.ptid,
+            num: this.num
+          }
+        }).then(res => {
+          console.log(res);
+          if (res.data.code) {
+            uni.setStorageSync("ordersubinfo", res.data);
+            uni.navigateTo({
+              url:
+                "/pages/order-sub/order-sub?guige=" +
+                this.typestr.join(",") +
+                "&ptid=" +
+                this.ptid +
+                "&num=" +
+                this.num+"&shoptype=4"
+            });
+          }
+          console.log(res.data.code, "code");
+        });
+      }else if(this.shoptype==4){
+        console.log(this.ptorderid,"ptorderid")
+         requestP({
+          url: "pay/pay_goods_pintuan",
+          data: {
+            goods_pt_id: this.ptid,
+            num: this.num
+          }
+        }).then(res => {
+          console.log(res);
+          if (res.data.code) {
+            uni.setStorageSync("ordersubinfo", res.data);
+            uni.navigateTo({
+              url:
+                "/pages/order-sub/order-sub?guige=" +
+                this.typestr.join(",") +
+                "&ptid=" +
+                this.ptid +
+                "&num=" +
+                this.num+"&shoptype=5&ptorderid="+this.ptorderid
+            });
+          }
+          console.log(res.data.code, "code");
+        });
+      }
+     
+    },
+  },
+  mounted() {
+    // conosle.log(this.tags)
+    // this.$set(this.typestr[i], 0, this.tags[i].guige_name + ":");
+    // this.$set(this.typestr[i], 1, this.tags[e].guige_val_list[f]);
+  },
+  watch: {
+    tags() {
+      for (let i in this.tags) {
+        this.tag.push([]);
+        this.typestr.push([]);
+        for (let j in this.tags[i].guige_val_list) {
+          console.log("初始");
+          this.tag[i].push(j == 0 ? "tag1" : "tag");
+        }
+      }
+      console.log(this.tags, 1112);
+      for (let i in this.tags) {
+        this.$set(this.typestr[i], 0, this.tags[i].guige_name + ":");
+        this.$set(this.typestr[i], 1, this.tags[i].guige_val_list[0]);
+        // console.log(this.tags[i].guige_name,this.tags[i].guige_val_list[0])
+      }
+      console.log(this.typestr, "typestr");
+    },
+    tag() {}
+  }
+};
+</script>
+
+<style lang="scss">
+.box {
+  width: 100%;
+  height: 100vh;
+  position: absolute;
+  top: 0;
+  z-index: 999;
+  background-color: rgba(126, 126, 126, 0.8);
+}
+.scroll-Y {
+  height: 100%;
+}
+.choosesize {
+  width: 100%;
+  // height:60%;
+  background-color: white;
+  position: fixed;
+  bottom: 0upx;
+  z-index: 999;
+  overflow: hidden;
+  height: 936rpx;
+  .top {
+    width: 100%;
+    background-color: white;
+    display: flex;
+    position: relative;
+    // justify-content:;
+    .shoppic {
+      width: 203upx;
+      height: 205upx;
+      margin-top: 39upx;
+      margin: 10upx;
+    }
+    .btn1 {
+      width: 71upx;
+      height: 33upx;
+      border-radius: 17upx;
+      line-height: 33upx;
+      text-align: center;
+      color: white;
+      background-color: #de3449;
+      font-size: 16upx;
+      margin-left: 6upx;
+      margin-right: 14upx;
+      position: absolute;
+      top: 190rpx;
+      left: 262rpx;
+    }
+    .price {
+      display: flex;
+      position: relative;
+      top: 190upx;
+      left: 120upx;
+      width: 500upx;
+      height: 20rpx;
+      .money {
+        color: #e32e10;
+        font-size: 26upx;
+        // position: absolute  ;
+        // z-index: 9999;
+      }
+      .huaxian {
+        color: #635b5b;
+        font-size: 22upx;
+        text-decoration: line-through;
+      }
+    }
+  }
+  .line {
+    height: 11upx;
+    width: 100%;
+    margin-top: 19upx;
+    background-color: #fbffde;
+  }
+  .title {
+    color: #6a6a6a;
+    font-size: 28upx;
+    margin-top: 29upx;
+    margin-left: 59upx;
+    margin-bottom: 45upx;
+    .zi {
+      position: relative;
+      top: 8upx;
+    }
+  }
+  .tags {
+    width: 700upx;
+    display: flex;
+    // justify-content: space-between;
+    margin-left: 53upx;
+    flex-wrap: wrap;
+    .tag {
+      // width: 119upx;
+      height: 53upx;
+      border: 2upx solid #d2d2d2;
+      color: #999999;
+      font-size: 26upx;
+      line-height: 53upx;
+      text-align: center;
+      margin-right: 53upx;
+      border-radius: 27upx;
+      margin-bottom: 20upx;
+      padding-left: 23upx;
+      padding-right: 23upx;
+    }
+    .tag1 {
+      // width: 119upx;
+      padding-left: 23upx;
+      padding-right: 23upx;
+      height: 53upx;
+      border: 2upx solid #de3449;
+      color: #b3304e;
+      background-color: #fae7ea;
+      font-size: 26upx;
+      line-height: 53upx;
+      text-align: center;
+      margin-right: 53upx;
+      border-radius: 27upx;
+      margin-bottom: 20upx;
+    }
+  }
+  .numbox {
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+  }
+  .number {
+    display: flex;
+    justify-content: space-between;
+    margin-top: 24rpx;
+    margin-bottom: 145upx;
+    .num {
+      width: 240upx;
+      height: 68upx;
+      margin-right: 33upx;
+      display: flex;
+      .reverse {
+        width: 68upx;
+        height: 68upx;
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+        border: 2upx solid #dcdcdc;
+        .icon {
+          width: 25upx;
+          height: 3upx;
+          margin-left: 22upx;
+        }
+        .icon1 {
+          width: 25upx;
+          height: 25upx;
+          margin-left: 22upx;
+        }
+      }
+      .shuliang {
+        width: 108upx;
+        height: 68upx;
+        border: 2upx solid #dcdcdc;
+        line-height: 68upx;
+        text-align: center;
+        color: #333333;
+        font-size: 34upx;
+      }
+    }
+  }
+  .btns {
+    height: 107upx;
+    width: 100%;
+    border-top: 1upx solid #eeeeee;
+    background-color: #fff;
+    display: flex;
+    justify-content: space-around;
+    // margin-top: -123rpx;
+    position: absolute;
+    z-index: 99999;
+    bottom: 0;
+    // top: 1053upx;
+    .btn1 {
+      width: 325upx;
+      height: 72upx;
+      border: 1upx solid #de3449;
+      margin: auto 0;
+      font-size: 28upx;
+      color: #de3449;
+      line-height: 72upx;
+      text-align: center;
+    }
+    .btn2 {
+      width: 325upx;
+      height: 72upx;
+      background-color: #de3449;
+      // border:1upx solid #DE3449;
+      margin: auto 0;
+      font-size: 28upx;
+      color: white;
+      line-height: 72upx;
+      text-align: center;
+    }
+    .btn3 {
+      width: 600upx;
+      height: 72upx;
+      background-color: #de3449;
+      // border:1upx solid #DE3449;
+      margin: auto 0;
+      font-size: 28upx;
+      color: white;
+      line-height: 72upx;
+      text-align: center;
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/components/shopdetail/shopdetail-commentstop.vue b/src/components/shopdetail/shopdetail-commentstop.vue
new file mode 100644
index 0000000..035df62
--- /dev/null
+++ b/src/components/shopdetail/shopdetail-commentstop.vue
@@ -0,0 +1,56 @@
+<template>
+  <view class="shopdetailCommentstop">
+      <view class="left">
+          <text>{{left}}</text>
+      </view>
+      <view class="right">
+        <text>{{right}}</text>
+        <img src="../../static/img/arrowmore.png" alt="" class="arrow" v-if="ifarrow">
+      </view>
+  </view>
+</template>
+
+<script>
+export default {
+    name:"shopdetailCommentstop",
+    props:{
+        left:{
+            tytpe:String
+        },
+        right:{
+            type:String
+        },
+        ifarrow:{
+            type:Boolean
+        }
+    }
+}
+</script>
+
+<style lang="scss">
+    .shopdetailCommentstop{
+        height: 62upx;
+        width: 100%;
+        color: #333333;
+        display: flex;
+        justify-content: space-between;
+        line-height: 62upx;
+    .left{
+        font-size: 30upx;
+        margin-left: 33upx;
+
+    }
+    .right{
+        font-size: 26upx;
+        margin-right: 30upx;
+    
+        .arrow{
+            width: 16upx;
+            height: 29upx;
+            margin-left: 14upx;
+            position: relative;
+            top: 5upx;
+        }
+    }
+    }
+</style>
\ No newline at end of file
diff --git a/src/components/shopdetail/shopdetail-detail.vue b/src/components/shopdetail/shopdetail-detail.vue
new file mode 100644
index 0000000..a62c63d
--- /dev/null
+++ b/src/components/shopdetail/shopdetail-detail.vue
@@ -0,0 +1,22 @@
+<template>
+  <view class="shopdetailDetail">
+      <!-- <img src="../../static/img/shopdetail.png" alt="" class="pic"> -->
+      <!-- <editor id="editor" class="ql-container" :placeholder="placeholder" @ready="onEditorReady"></editor> -->
+      <rich-text :nodes="strings"></rich-text>
+  </view>
+</template>
+
+<script>
+export default {
+name:"shopdetailDetail",
+props:["strings"]
+
+}
+</script>
+
+<style lang="scss">
+// .pic{
+//     width: 100%;
+//     height: 22509upx;
+// }
+</style>
\ No newline at end of file
diff --git a/src/components/shopdetail/shopdetail-ensure.vue b/src/components/shopdetail/shopdetail-ensure.vue
new file mode 100644
index 0000000..01ff133
--- /dev/null
+++ b/src/components/shopdetail/shopdetail-ensure.vue
@@ -0,0 +1,110 @@
+<template>
+  <view :class="ensurepic=='../../static/img/pintuanensure.png'?'shopdetailEnsure1':'shopdetailEnsure'">
+    <view class="left">
+        <view :class="ensurepic=='../../static/img/pintuanensure.png'?'ensure2':'ensure'">
+              <img :src="ensurepic" alt  class="ensure1"/>
+              <text>{{ensurearr[0]}}</text>
+        </view>
+           <view :class="ensurepic=='../../static/img/pintuanensure.png'?'ensure2':'ensure'">
+              <img :src="ensurepic" alt  class="ensure1"/>
+              <text>{{ensurearr[1]}}</text>
+        </view>
+            <view :class="ensurepic=='../../static/img/pintuanensure.png'?'ensure2':'ensure'">
+              <img :src="ensurepic" alt  class="ensure1"/>
+              <text>{{ensurearr[2]}}</text>
+        </view>
+            <view :class="ensurepic=='../../static/img/pintuanensure.png'?'ensure2':'ensure'">
+              <img :src="ensurepic" alt  class="ensure1"/>
+              <text>{{ensurearr[3]}}</text>
+        </view>
+    </view>
+    <view class="right" @click="more" v-if="ensurepic!='../../static/img/pintuanensure.png'">
+      <img src="../../static/img/more.png" alt class="more" />
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  name: "shopdetailEnsure",
+  data(){
+      return {
+          ensurearr:[],
+          ensure:"ensure",
+          shopdetailEnsure:'shopdetailEnsure'
+      }
+  },
+  mounted(){
+    
+  },
+  props:{
+      ensures:{
+          type:String
+      },
+      ensurepic:{
+        type:String
+      }
+  },
+  mounted(){
+      this.ensurearr=this.ensures.split(',')
+  },
+  methods:{
+    more(){
+      this.$emit("more",true)
+    }
+  }
+};
+</script>
+
+<style lang="scss">
+.shopdetailEnsure {
+  height: 78upx;
+  width: 100%;
+  background-color: #f0f3fa;
+  display: flex;
+  justify-content: space-between;
+
+}
+.shopdetailEnsure1 {
+  height: 78upx;
+  width: 100%;
+  background-color:white;
+  display: flex;
+  justify-content: space-between;
+
+}
+  .left {
+    width: 531upx;
+    height: 100%;
+    display: flex;
+    justify-content: space-around;
+    line-height: 78upx;
+    .ensure{
+        color: #4F95E4;
+        font-size: 22upx;
+        margin-left: 11upx;
+        font-weight:500;
+       
+    }
+     .ensure1{
+            width:22upx;
+            height: 22upx;
+            margin-right: 11upx
+
+        }
+        .ensure2{
+              color: #D81E50;
+        font-size: 22upx;
+        margin-left: 11upx;
+        font-weight:500;
+        }
+  }
+  .right {
+    .more {
+      width: 33upx;
+      height: 9upx;
+      margin-right: 31upx;
+      line-height:78upx;
+    }
+  }
+</style>
\ No newline at end of file
diff --git a/src/components/shopdetail/shopdetail-line.vue b/src/components/shopdetail/shopdetail-line.vue
new file mode 100644
index 0000000..6abab2f
--- /dev/null
+++ b/src/components/shopdetail/shopdetail-line.vue
@@ -0,0 +1,17 @@
+<template>
+    <view class="shopdetailLine"></view>
+</template>
+
+<script>
+export default {
+    name:"shopdetailLine"
+}
+</script>
+
+<style lang="scss">
+.shopdetailLine{
+    height: 18upx;
+    width: 100%;
+    background-color:#EEEEEE;
+}
+</style>
\ No newline at end of file
diff --git a/src/components/shopdetail/shopdetail-pinglun.vue b/src/components/shopdetail/shopdetail-pinglun.vue
new file mode 100644
index 0000000..560d679
--- /dev/null
+++ b/src/components/shopdetail/shopdetail-pinglun.vue
@@ -0,0 +1,50 @@
+<template>
+    <view class="shopdetailPinglun">
+        <view class="item" v-for="item in content1" :key="item">{{item}}</view>
+    </view>
+</template>
+
+<script>
+export default {
+    name:'shopdetailPinglun',
+    props:{
+        content:{
+            type:String
+        }
+    },
+    data(){
+        return{
+            content1:[]
+        }
+    },
+    mounted(){
+        this.content1=this.content.split(',')
+    },
+    methods:{
+
+    }
+
+}
+</script>
+
+<style lang="scss">
+.shopdetailPinglun{
+    width: 523upx;
+    color: #666666;
+    font-size: 21upx;
+    line-height: 49upx;
+    text-align: center;
+    display: flex;
+    flex-wrap: wrap;
+
+    .item{
+        // width: 191upx;
+        height: 49upx;
+        margin-right: 26upx;
+        padding: 10upx 20upx;
+        background-color: #FEF5F6;
+        margin-bottom: 19upx;
+        border-radius: 25upx;
+    }
+}
+</style>
\ No newline at end of file
diff --git a/src/components/shopdetail/shopdetail-pri.vue b/src/components/shopdetail/shopdetail-pri.vue
new file mode 100644
index 0000000..c61110c
--- /dev/null
+++ b/src/components/shopdetail/shopdetail-pri.vue
@@ -0,0 +1,30 @@
+<template>
+  <view class="shopdetailPri">
+      <text class="icon">￥</text>
+      <text class="money">{{pri}}</text>
+  </view>
+</template>
+
+<script>
+export default {
+    name:"shopdetailPri",
+    props:{
+        pri:{
+            type:String
+        }
+    }
+}
+</script>
+
+<style lang="scss">
+.shopdetailPri{
+    color:#DD0000;
+    .icon{
+        font-size: 23upx;
+    }
+    .money{
+        font-size: 40upx;
+        font-weight:800;
+    }
+}
+</style>
\ No newline at end of file
diff --git a/src/components/shopdetail/shopdetail-servicelist.vue b/src/components/shopdetail/shopdetail-servicelist.vue
new file mode 100644
index 0000000..459e6eb
--- /dev/null
+++ b/src/components/shopdetail/shopdetail-servicelist.vue
@@ -0,0 +1,147 @@
+<template>
+<view class="box" @touchmove.stop.prevent="moveHandle" v-if="ifservice" @click="turnoff">
+     <view class="servicelist">
+        <view class="top">
+            <text>服务</text>
+            <view class="close" @click="turnoff"> 
+                <img src="../../static/img/off.png" alt="" class="off">
+            </view>
+        </view>
+        
+        <view class="mid">
+             <scroll-view  :scroll-y="true" class="scroll-Y"
+                @scroll="scroll">
+            <view class="item">
+                <view class="item-1">
+                    <img src="../../static/img/serviceicon.png" alt="" class="icon">
+                    <text>全正品</text>
+                    <view class="desc">各大厂商 直接供货</view>
+                </view>
+                  <view class="item-1">
+                    <img src="../../static/img/serviceicon.png" alt="" class="icon">
+                    <text>全正品</text>
+                    <view class="desc">各大厂商 直接供货</view>
+                </view>
+                   <view class="item-1">
+                    <img src="../../static/img/serviceicon.png" alt="" class="icon">
+                    <text>全正品</text>
+                    <view class="desc">各大厂商 直接供货</view>
+                </view>
+                 <view class="item-1">
+                    <img src="../../static/img/serviceicon.png" alt="" class="icon">
+                    <text>全正品</text>
+                    <view class="desc">各大厂商 直接供货</view>
+                </view>
+                 <view class="item-1">
+                    <img src="../../static/img/serviceicon.png" alt="" class="icon">
+                    <text>全正品</text>
+                    <view class="desc">各大厂商 直接供货</view>
+                </view>
+                 <view class="item-1">
+                    <img src="../../static/img/serviceicon.png" alt="" class="icon">
+                    <text>全正品</text>
+                    <view class="desc">各大厂商 直接供货</view>
+                </view>
+                                 <view class="item-1">
+                    <img src="../../static/img/serviceicon.png" alt="" class="icon">
+                    <text>全正品</text>
+                    <view class="desc">各大厂商 直接供货</view>
+                </view>
+                
+                                 <view class="item-1">
+                    <img src="../../static/img/serviceicon.png" alt="" class="icon">
+                    <text>全正品</text>
+                    <view class="desc">各大厂商 直接供货</view>
+                </view>
+                
+                                 <view class="item-1">
+                    <img src="../../static/img/serviceicon.png" alt="" class="icon">
+                    <text>全正品aaaa</text>
+                    <view class="desc">各大厂商 直接供货aaaa</view>
+                </view>
+
+            </view>
+                  </scroll-view>
+        </view>
+  
+    </view>
+</view>
+   
+</template>
+
+<script>
+export default {
+    name:"servicelist",
+    props:{
+        ifservice:{
+            type:Boolean
+        }
+    },
+    methods:{
+        moveHandle(){
+
+        },
+        scroll(){},
+        turnoff(){
+            this.$emit("turnoff",false)
+        }
+    }
+}
+</script>
+
+<style lang="scss">
+.box{
+    width: 100%;
+    height: 100vh;
+    background-color: rgba(127, 127, 127, 0.5);
+
+}
+.servicelist{
+    background-color: white;
+    height: 949upx;
+    .top{
+        height: 97upx;
+        color: #333333;
+        font-size: 30upx;
+        line-height: 97upx;
+        text-align: center;
+        border-bottom: 2upx solid #D9D9D9;
+        margin-bottom: 35upx;
+        .close{
+            width: 26upx;
+            height: 26upx;
+            float: right;
+            margin: auto 0;
+            margin-right: 33upx;
+            .off{
+                width: 100%;
+                height: 100%;
+            }
+        }
+    }
+    .mid{
+        .item{
+            color: #333333;
+            font-size: 26upx;
+            .item-1{
+                margin-bottom: 60upx;
+            }
+            .icon{
+                width: 24upx;
+                height: 24upx;
+                margin-left:30upx;
+                margin-right: 20upx;
+            }
+            .desc{
+                color: #999999;
+                font-size: 22upx;
+                margin-top: 16upx;
+                margin-left: 73upx;
+            }
+        }
+    }
+    .scroll-Y{
+         height: 790upx;
+    }
+}
+</style>
\ No newline at end of file
diff --git a/src/components/shopdetail/shopdetail-shopname.vue b/src/components/shopdetail/shopdetail-shopname.vue
new file mode 100644
index 0000000..7da7b70
--- /dev/null
+++ b/src/components/shopdetail/shopdetail-shopname.vue
@@ -0,0 +1,34 @@
+<template>
+  <view class="shopdetailShopinfo">
+    <view>{{shopname}} </view>
+    <view class="desc">{{shopdesc}}</view>
+  </view>
+</template>
+
+<script>
+export default {
+  name: "shopdetailShopinfo",
+  props:{
+      shopname:{
+          type:String
+      },
+      shopdesc: {
+          type:String
+      }
+  }
+};
+</script>
+
+<style lang="scss">
+.shopdetailShopinfo {
+  width: 687upx;
+  height: 144upx;
+  font-size: 30upx;
+  color: #333333;
+  .desc{
+      color: #666666;
+      font-size: 24upx;
+      margin-top: 47upx;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/components/shopdetail/shopdetail-toppic.vue b/src/components/shopdetail/shopdetail-toppic.vue
new file mode 100644
index 0000000..1c26d9e
--- /dev/null
+++ b/src/components/shopdetail/shopdetail-toppic.vue
@@ -0,0 +1,78 @@
+<template>
+  <view class="shopdetailToppic">
+      <swiper class="pic" :indicator-dots="indicatorDots" :autoplay="autoplay" :interval="interval" :duration="duration" circular="true" @change="change1">
+                        <swiper-item  v-for="(item,j) in picarr" :key="j">
+                            <view >
+                                <img :src="item.img_path" alt  class="pic" v-if="isvideo"/>
+                                   <img :src="item.img_path" alt  class="pic" v-else/>
+                            </view>
+                        </swiper-item>
+                        <!-- <swiper-item class="pic">
+                            <view class="swiper-item uni-bg-green">
+                               <img src="../../static/img/caricon.png" alt class="pic" />
+                            </view>
+                        </swiper-item>
+                        <swiper-item class="pic">
+                            <view class="swiper-item uni-bg-blue">
+                               <img src="../../static/img/caricon1.png" alt class="pic" />
+                            </view>
+                        </swiper-item> -->
+                    </swiper>
+    <!-- <view class="imgbox">
+      <img src="../../static/img/shoplb.png" alt class="pic" />
+    </view> -->
+  </view>
+</template>
+
+<script>
+export default {
+  name: "shopdetailToppic",
+  data(){
+    return{
+      picarr1:[]
+    }
+    
+  },
+  props:{
+    isvideo:{
+      type:String,
+    },
+      picarr:{
+        
+      }
+  },
+  beforeDestroy(){
+    console.log(this.picarr,156999)
+  },
+  methods:{
+    change1(e){
+        // console.log(e)
+        var ifsp=false
+        if(e.detail.current==0){
+          ifsp=true
+        }
+        this.$emit("btnchange",ifsp)
+    }
+  },
+
+};
+</script>
+
+<style lang="scss">
+.shopdetailToppic {
+      height: 752upx;
+      display: flex;
+      flex-direction: column;
+      justify-content:center;
+  .imgbox {
+      display: flex;
+      flex-direction: column;
+      justify-content: center;
+
+  }
+      .pic {
+      width: 100%;
+      height: 752upx;
+    }
+}
+</style>
\ No newline at end of file
diff --git a/src/components/shopping/cartbottom.vue b/src/components/shopping/cartbottom.vue
new file mode 100644
index 0000000..5b96c4d
--- /dev/null
+++ b/src/components/shopping/cartbottom.vue
@@ -0,0 +1,113 @@
+<template>
+  <view class="bottom">
+    <view class="all" @click="selectAll">
+      <img :src="all?'../../static/img/cartselected.png':'../../static/img/cartselect.png'" alt class="qx" />
+      <text class="quanxuan">全选</text>
+    </view>
+
+    <view class="heji">
+      合计
+      <text class="price">
+        <text>￥</text>
+        <text class="money">{{zhengshu}}</text>
+        <text>.{{xiaoshu}}</text>
+      </text>
+    </view>
+    <view class="btn" @click="jiesuan">结算({{sum}})</view>
+  </view>
+</template>
+
+<script>
+export default {
+  name: "shoppingCartbottom",
+  data() {
+    return {
+      zhengshu:0,
+      xiaoshu:0
+    };
+  },
+  props: ["total","price","sum","all"],
+  computed:{
+  
+  },
+  watch:{
+    price(price){
+      this.zhengshu =(price-(price % 100))/100
+      this.xiaoshu = price % 100
+      this.xiaoshu = this.xiaoshu < 10 ? "0"+this.xiaoshu:this.xiaoshu
+      console.log(this.zhengshu,this.xiaoshu)
+    }
+  },
+  methods:{
+  // zhengshu(price){
+    //   console.log(price-(price % 100))
+    //   return price-(price % 100)
+    // },
+    // xiaoshu(price){
+    //   console.log(price % 100)
+    //   return  price % 100
+    // },
+    jiesuan(){
+      this.$emit("jiesuan",true)
+    },
+    selectAll(){
+      this.$emit("selectAll",!this.all)
+    }
+  },
+  mounted() {
+    // var money = this.heji.toString().split(".");
+    // this.zhengshu = money[0];
+    // this.xiaoshu = money[1];
+    // console.log(this.zhengshu, 100);
+    // console.log(this.xiaoshu, 100);
+  }
+};
+</script>
+
+<style lang="scss">
+.bottom {
+  width: 100%;
+  height: 83upx;
+  margin: 0 auto;
+  display: flex;
+  justify-content: space-between;
+  padding-left: 20rpx;
+box-sizing: border-box;
+
+  .qx {
+    width: 21upx;
+    height: 21upx;
+    margin-right:9upx;
+  }
+  .quanxuan {
+    font-size: 23upx;
+    color: #666666;
+    line-height: 83upx;
+  }
+  .heji {
+    color: #666666;
+    font-size: 24upx;
+    line-height: 83upx;
+    position:relative;
+   left: -10rpx;
+width: 330rpx;
+
+    .price {
+      color: #e13249;
+      font-size: 26upx;
+    }
+  }
+  .btn {
+    width: 275upx;
+    height: 83upx;
+    background-color: #de3548;
+    color: white;
+    font-size: 26upx;
+    text-align: center;
+    line-height: 83upx;
+  }
+  .all{
+    width: 100upx;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/components/shopping/cartnull.vue b/src/components/shopping/cartnull.vue
new file mode 100644
index 0000000..c9104c9
--- /dev/null
+++ b/src/components/shopping/cartnull.vue
@@ -0,0 +1,52 @@
+<template>
+  <view class="shoppingCartnull">
+    <view class="cartnulls">
+        <view>
+             <img :src="picurl" alt class="cartnull" />
+      <view class="desc">{{ale}}</view>
+        </view>
+     
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  name: "shoppingCartnull",
+  props:{
+    picurl:{
+      type:String
+    },
+    ale:{
+      type:String
+    },
+    desc:{
+      type:String
+    }
+  }
+};
+</script>
+
+<style lang="scss">
+.shoppingCartnull {
+    height: 100vh;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;;
+  .cartnulls {
+      display:flex;
+      justify-content: center;
+    .cartnull {
+      width: 305upx;
+      height: 331upx;
+      margin: auto;
+    }
+  }
+  .desc{
+      color: #333333;
+      font-size: 30upx;
+      text-align: center;
+      margin-top: 57upx;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/components/shopping/cartshop.vue b/src/components/shopping/cartshop.vue
new file mode 100644
index 0000000..b3f9b2a
--- /dev/null
+++ b/src/components/shopping/cartshop.vue
@@ -0,0 +1,256 @@
+<template>
+  <view @click="xz">
+     <view
+      class="shoppingCartshop"
+      @touchmove="handletouchmove"
+      @touchstart="handletouchstart"
+      @touchend="handletouchend"
+     v-if="ifdel"
+    >
+    <!-- ../../static/img/selected.png -->
+      <view class="shopdetail">
+        <img :src="shoppic" alt class="cartshop" />
+        <view class="shopinfo">
+          <view class="shopname">{{shopname}}</view>
+          <view class="shopinfodown">
+            <text class="price">
+              <text>￥</text>
+              <text class="money">{{zhengshu}}</text>
+              <text>.{{xiaoshu}}</text>
+            </text>
+            <!-- <text class="btn">活动商品</text>
+            <text class="btn1">限购五件</text> -->
+          </view>
+        </view>
+      </view>
+      <view class="num">x{{num}}</view>
+       <view class="del" @click.stop="del">删除</view>
+    </view>
+    <view
+      class="shoppingCartshop"
+      @touchmove="handletouchmove"
+      @touchstart="handletouchstart"
+      @touchend="handletouchend"
+      v-else
+    >
+    <!-- ../../static/img/selected.png -->
+      <img :src="ifselect?'../../static/img/selected.png':'../../static/img/cartselect.png'" alt class="xz" />
+      <view class="shopdetail">
+        <img :src="shoppic" alt class="cartshop" />
+        <view class="shopinfo">
+          <view class="shopname">{{shopname}}</view>
+          <view class="shopinfodown">
+            <text class="price">
+              <text>￥</text>
+              <text class="money">{{zhengshu}}</text>
+              <text>.{{xiaoshu}}</text>
+            </text>
+            <!-- <text class="btn">活动商品</text>
+            <text class="btn1">限购五件</text> -->
+          </view>
+        </view>
+      </view>
+      <view class="num">x{{num}}</view>
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  name: "shoppingCartshop",
+  data() {
+    return {
+      flag: 0,
+      text: "",
+      lastX: 0,
+      lastY: 0,
+      ifdel: false,
+      zhengshu: 0,
+      xiaoshu: "00",
+      ifselect:false
+    };
+  },
+  props: {
+    shoppic: {
+      type: String
+    },
+    shopname: {
+      type: String
+    },
+    money: {
+      type: Number
+    },
+    num: {
+      type: Number
+    },
+    ifxz:{
+      type:Boolean
+    },
+    no:{
+      type:Number
+    },
+    goodsid:{
+      type:Number
+    }
+  },
+  watch:{
+    ifxz(){
+      this.ifselect = this.ifxz
+    }
+  },
+  mounted() {
+    var money = this.money.toString().split(".");
+    this.zhengshu = money[0];
+    this.xiaoshu = money[1];
+    //  console.log(this.zhengshu,100)
+    //  console.log(this.xiaoshu,100)
+  },
+  methods: {
+    del(){
+      this.$emit("del",this.no)
+    },
+    handletouchmove: function(event) {
+      // console.log(event)
+      if (this.flag !== 0) {
+        return;
+      }
+      let currentX = event.touches[0].pageX;
+      let currentY = event.touches[0].pageY;
+      let tx = currentX - this.lastX;
+      let ty = currentY - this.lastY;
+      let text = "";
+      this.mindex = -1;
+      //左右方向滑动
+      if (Math.abs(tx) > Math.abs(ty)) {
+        if (tx < 0) {
+          text = "向左滑动";
+          this.flag = 1;
+          console.log("左");
+          this.ifdel = true;
+          //  this.getList();  //调用列表的方法
+        } else if (tx > 0) {
+          text = "向右滑动";
+          this.flag = 2;
+          console.log("右");
+          this.ifdel = false;
+        }
+      }
+      //上下方向滑动
+      else {
+        if (ty < 0) {
+          text = "向上滑动";
+          this.flag = 3;
+          //  this.getList();  //调用列表的方法
+        } else if (ty > 0) {
+          text = "向下滑动";
+          this.flag = 4;
+        }
+      }
+
+      //将当前坐标进行保存以进行下一次计算
+      this.lastX = currentX;
+      this.lastY = currentY;
+      this.text = text;
+    },
+    handletouchstart: function(event) {
+      // console.log(event)
+      this.lastX = event.touches[0].pageX;
+      this.lastY = event.touches[0].pageY;
+    },
+    handletouchend: function(event) {
+      this.flag = 0;
+      this.text = "没有滑动";
+    },
+    xz(){
+      this.ifselect=this.ifselect==false?true:false
+      this.$emit('selected',[this.ifselect,this.no]);
+      this.$emit('dianji',true)
+      // this.$emit("order",this.no)
+      // console.log(this.no)
+      // console.log(this.ifxz)
+    }
+  }
+};
+</script>
+
+<style lang="scss">
+.shoppingCartshop {
+  height: 197upx;
+  background-color: white;
+  display: flex;
+  justify-content: space-between;
+  .xz {
+    width: 27upx;
+    height: 27upx;
+    margin: auto 0;
+    margin-left: 21upx;
+  }
+  .shopdetail {
+    // width: 476upx;
+    height: 154upx;
+    margin: auto 0;
+    display: flex;
+    .cartshop {
+      width: 149upx;
+      height: 154upx;
+    }
+    .pic1 {
+      margin-left: -89upx;
+    }
+    .shopinfo {
+      width: 490upx;
+      display: flex;
+      flex-direction: column;
+      justify-content: space-between;
+      color: #151515;
+      font-size: 26upx;
+      .shopname {
+        margin-left: 15upx;
+      }
+      .price {
+        color: #e13249;
+        font-size: 26upx;
+        margin-left: 14upx;
+        margin-right: 10upx;
+        .money {
+          font-size: 34upx;
+        }
+      }
+      .btn {
+        padding: 7upx 5upx;
+        background-color: #e0314b;
+        border: 2upx solid #e0314b;
+
+        color: white;
+        font-size: 20upx;
+      }
+      .btn1 {
+        padding: 7upx 5upx;
+        background-color: white;
+        color: #e0314b;
+        font-size: 20upx;
+        margin-left: 3upx;
+        border: 2upx solid #e0314b;
+        // box-sizing: border-box;
+      }
+    }
+  }
+  .num {
+    position: relative;
+    top: 152upx;
+    right: 44upx;
+    color: #000000;
+    font-size: 18upx;
+    height: 22rpx;
+    // margin-left: 151upx;
+  }
+  .del {
+    width: 133upx;
+    background-color: #df3347;
+    font-size: 30upx;
+    color: white;
+    text-align: center;
+    line-height: 197upx;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/components/shopping/carttittle.vue b/src/components/shopping/carttittle.vue
new file mode 100644
index 0000000..ac1af55
--- /dev/null
+++ b/src/components/shopping/carttittle.vue
@@ -0,0 +1,46 @@
+<template>
+  <view class="carttittle">
+      <view>
+           <img src="../../static/img/alert.png" alt="" class="ale">
+           <text class="alert">向左滑动删除</text>
+      </view>
+     <view class="right" @click="getyhq">领券</view>
+  </view>
+</template>
+
+<script>
+export default {
+name:"shoppingCarttitle",
+methods:{
+    getyhq(){
+        this.$emit("getyhq",true)
+    }
+}
+}
+</script>
+
+<style lang="scss">
+.carttittle{
+    height:79upx;
+    background-color: #F6F6F6;
+    display: flex;
+    justify-content: space-between;
+    .ale{
+        width:23upx;
+        height: 23upx;
+        margin-left: 29upx;
+        margin-right: 11upx;
+    }
+    .alert{
+        color: #222222;
+        font-size: 22upx;
+        line-height: 80upx;
+    }
+    .right{
+        color: #D9324C;
+        font-size: 26upx;
+        line-height: 80upx;
+        margin-right: 37upx;
+    }
+}
+</style>
\ No newline at end of file
diff --git a/src/components/shopservice/shopservice-shop.vue b/src/components/shopservice/shopservice-shop.vue
new file mode 100644
index 0000000..33cfe62
--- /dev/null
+++ b/src/components/shopservice/shopservice-shop.vue
@@ -0,0 +1,79 @@
+<template>
+  <view class="shopserviceShop">
+      <view class="shopinfo">
+          <img :src="shoppic" alt="" class="pic">
+          <view class="carname">{{shopname}}</view>
+      </view>
+      <view class="price">
+          <view class="pri"><text class="icon">￥</text>{{pri}}</view>
+          <view class="num">x{{num}}</view>
+      </view>
+  </view>
+</template>
+
+<script>
+export default {
+    name:'shopserviceShop',
+    props:{
+        shoppic: {
+            type:String
+        },
+        shopname:{
+            type:String
+        },
+        pri:{
+            type:Number
+        },
+        num:{
+            type:Number
+        }
+    }
+
+}
+</script>
+
+<style lang="scss">
+.shopserviceShop{
+    height: 139upx;
+    background-color: white;
+    display: flex;
+    justify-content: space-between;
+    .shopinfo{
+        width: 577upx;
+        height:104upx;
+        display: flex;
+        margin-left: 21upx;
+        .pic{
+            width: 104upx;
+            height: 104upx;
+        }
+        .carname{
+            color: #333333;
+            font-size: 26upx;
+            width:437upx;
+            margin: auto 0;
+            line-height: 44upx;
+            margin-left:35upx;
+        }
+    }
+    .price{
+        width: 45upx;
+        height: 61upx;
+        margin-right: 80upx;
+       margin-top: 15upx;
+        .pri{
+            font-size: 25upx;
+            color: #DF3348;
+            .icon{
+                font-size:23upx;
+            }
+        }
+        .num{
+            color: #494949;
+            font-size: 22upx;
+            text-align: center;
+            margin-top: 21upx;
+        }
+    }
+}
+</style>
\ No newline at end of file
diff --git a/src/components/shopservice/shopservice-title.vue b/src/components/shopservice/shopservice-title.vue
new file mode 100644
index 0000000..65b66b3
--- /dev/null
+++ b/src/components/shopservice/shopservice-title.vue
@@ -0,0 +1,36 @@
+<template>
+  <view class="shopserviceTitle">
+      <view class="line"></view>
+      <view class="title">发动机养护</view>
+  </view>
+</template>
+
+<script>
+export default {
+    name:'shopserviceTitle'
+}
+</script>
+
+<style lang="scss">
+.shopserviceTitle{
+    height:62upx;
+    border-top:2upx solid #D9D9D9;
+    border-bottom:2upx solid #D9D9D9;
+    display: flex;
+    background-color: white;
+    .line{                      
+        width: 3upx;
+        height: 26upx;
+        background-color:#DF3348;
+        margin: auto 0;
+        margin-left: 29upx;
+    }
+    .title{
+        color: #222222;
+        font-size: 22upx;
+        text-indent:20upx;
+        line-height: 62upx;
+    }
+
+}
+</style>
\ No newline at end of file
diff --git a/src/components/suggestion/suggestion-bottom.vue b/src/components/suggestion/suggestion-bottom.vue
new file mode 100644
index 0000000..b9200fc
--- /dev/null
+++ b/src/components/suggestion/suggestion-bottom.vue
@@ -0,0 +1,59 @@
+<template>
+  <view class="bottom">
+      <view class="tittle">
+          <suggestionTittle tittle1="您的联系方式："></suggestionTittle> 
+      </view>
+
+<input type="text" class="shuru" placeholder="请输入您的邮箱号">
+<button class="btn">意见反馈</button>
+<view class="desc">
+
+                            请留下您的联系方式，以便我们能够方便了解问题以及您反馈
+问题结果。紧急问题可拨打123-456-789，获得及时帮助
+感谢您的意见与反馈
+                        
+</view>
+  </view>
+</template>
+
+<script>
+import suggestionTittle from "../../components/suggestion/suggestion-tittle"
+export default {
+components:{
+    suggestionTittle
+}
+}
+</script>
+
+<style lang="scss">
+.shuru{
+    width: 692upx;
+    height: 100upx;
+    color: #999999;
+    font-size: 24upx;
+    text-indent: 30upx;
+    margin:0 auto;
+    margin-top: 26upx;
+    border:1upx solid rgba(210,210,210,1);
+}
+.btn{
+    width:689upx;
+height:91upx;
+background:#DD3648;
+border-radius:6upx;
+color: white;
+margin-top: 163upx;
+}
+.desc{
+    width: 539upx;
+    height:88upx;
+    font-size:20upx;
+    color: #D5D2D2;
+    text-align: center;
+    margin: 0 auto;
+    margin-top: 76upx;
+}
+.tittle{
+    padding-top: 22upx;
+}
+</style>
\ No newline at end of file
diff --git a/src/components/suggestion/suggestion-line.vue b/src/components/suggestion/suggestion-line.vue
new file mode 100644
index 0000000..fcd8091
--- /dev/null
+++ b/src/components/suggestion/suggestion-line.vue
@@ -0,0 +1,17 @@
+<template>
+    <view class="suggestionLine"></view>
+</template>
+
+<script>
+export default {
+    name:"suggestionLIne"
+}
+</script>
+
+<style lang="scss">
+.suggestionLine{
+    height: 14upx;
+    width: 100%;
+    background-color: #EEEEEE
+}
+</style>
\ No newline at end of file
diff --git a/src/components/suggestion/suggestion-mid.vue b/src/components/suggestion/suggestion-mid.vue
new file mode 100644
index 0000000..438cf87
--- /dev/null
+++ b/src/components/suggestion/suggestion-mid.vue
@@ -0,0 +1,38 @@
+<template>
+  <view class="suggestionMid">
+      <view class="tittle">
+              <suggestionTittle  tittle1="您的问题或建议"></suggestionTittle>
+      </view>
+      <textarea name="" id="" cols="30" rows="10" class="content" placeholder="请输入您的问题或建议"></textarea>
+  </view>
+</template>
+
+<script>
+import suggestionTittle from "../../components/suggestion/suggestion-tittle"
+export default {
+    name:"suggestionMid",
+    components:{
+        suggestionTittle
+    }
+}
+</script>
+
+<style lang="scss">
+.suggestionMid{
+    .tittle{
+        margin-top: 29upx;
+    }
+    .content{
+        width: 692upx;
+        height: 260upx;
+        border-radius: 10upx;
+        margin: 0 auto;
+        margin-top: 31upx;
+        border:1upx solid rgba(210,210,210,1);
+        color: #999999;
+        font-size: 24upx;
+        text-indent: 24upx;
+        padding-top: 18upx;
+    }
+}
+</style>
\ No newline at end of file
diff --git a/src/components/suggestion/suggestion-tittle.vue b/src/components/suggestion/suggestion-tittle.vue
new file mode 100644
index 0000000..fdbafd3
--- /dev/null
+++ b/src/components/suggestion/suggestion-tittle.vue
@@ -0,0 +1,24 @@
+<template>
+  <view class="suggestionTittle">
+      {{tittle1}}
+  </view>
+</template>
+
+<script>
+export default {
+    name:"suggestionTittle",
+    props:{
+        tittle1:{
+            type:String
+        }
+    }
+}
+</script>
+
+<style lang="scss">
+.suggestionTittle{
+    color: #333333;
+    font-size: 30upx;
+    text-indent: 30upx;
+}
+</style>
\ No newline at end of file
diff --git a/src/components/suggestion/suggestion-top.vue b/src/components/suggestion/suggestion-top.vue
new file mode 100644
index 0000000..11d4ded
--- /dev/null
+++ b/src/components/suggestion/suggestion-top.vue
@@ -0,0 +1,34 @@
+<template>
+  <view class="suggestionTop">
+    <img src="../../static/img/server.png" alt class="server" />
+    <view class="desc">遇到问题了？点<text class="online">在线客服</text>某某立刻解答您的问题。</view>
+  </view>
+</template>
+
+<script>
+export default {
+  name: "suggestionTop"
+};
+</script>
+
+<style lang="scss">
+.suggestionTop {
+    height: 95upx;
+    display: flex;
+    justify-content: center;
+  .server {
+    width: 40upx;
+    height: 42upx;
+    margin: auto 0;
+  }
+  .desc{
+      font-size: 26upx;
+      color: #949494;
+      margin-left: 20upx;
+      line-height: 95upx;
+      .online{
+          color: #DD3648;
+      }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/components/suggestion/suggestionnull.vue b/src/components/suggestion/suggestionnull.vue
new file mode 100644
index 0000000..42ed62b
--- /dev/null
+++ b/src/components/suggestion/suggestionnull.vue
@@ -0,0 +1,60 @@
+<template>
+  <view class="suggestionNull">
+    <view class="cartnulls">
+      <view>
+        <img :src="picurl" alt class="cartnull" />
+        <view class="desc">{{ale}}</view>
+      
+      </view>
+    </view>
+      <view class="desc1">感谢你对养车小程序的关注与支持，我们会认真处理你的反馈，尽快修复和完善相关功能</view>
+  </view>
+</template>
+
+<script>
+export default {
+  name: "suggestionNull",
+  props: {
+    picurl: {
+      type: String
+    },
+    ale: {
+      type: String
+    },
+    desc: {
+      type: String
+    }
+  }
+};
+</script>
+
+<style lang="scss">
+.suggestionNull {
+  height: 100vh;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  .cartnulls {
+    display: flex;
+    justify-content: center;
+    .cartnull {
+      width: 176upx;
+      height: 176upx;
+      margin: auto;
+    }
+  }
+  .desc {
+    color: #333333;
+    font-size: 30upx;
+    text-align: center;
+    margin-top: 57upx;
+  }
+  .desc1{
+    width:697upx;
+    color: #7B7B7B;
+    font-size: 28upx;
+    text-align: center;
+    margin: 0 auto;    
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/components/tabbar/tabbar.vue b/src/components/tabbar/tabbar.vue
new file mode 100644
index 0000000..6d1a58b
--- /dev/null
+++ b/src/components/tabbar/tabbar.vue
@@ -0,0 +1,100 @@
+<template>
+  <view class="tabbar">
+      <view @click="tz"  data-tab="1">
+          <img :src="imgurl[0]" alt="" class="logo">
+          <view class="nav">首页</view>
+      </view>
+   <view @click="tz" data-tab="2">
+          <img :src="imgurl[1]" alt="" class="logo">
+          <view class="nav">保养</view>
+      </view>
+      <view @click="tz" data-tab="3">
+          <img :src="imgurl[2]" alt="" class="logo">
+          <view class="nav">分类</view>
+      </view>
+      <view @click="tz" data-tab="4">
+          <img :src="imgurl[3]" alt="" class="logo">
+          <view class="nav">我的</view>
+      </view>
+
+  </view>
+</template>
+
+<script>
+export default {
+    name:"tabbar",
+    data(){
+        return{
+            imgurl:["../../static/img/homesel.png","../../static/img/baoyang.png","../../static/img/fenlei.png","../../static/img/wode.png"]
+        }
+    },
+    props:{
+        page:{
+            type:Number
+        }
+    },
+    mounted(){
+          switch(this.page){
+                case 1:
+                    this.imgurl=["../../static/img/homesel.png","../../static/img/baoyang.png","../../static/img/fenlei.png","../../static/img/wode.png"]
+                    break;
+                case 2:
+                    this.imgurl=["../../static/img/home.png","../../static/img/baoyangsel.png","../../static/img/fenlei.png","../../static/img/wode.png"]
+                    break;
+                case 3:
+                    this.imgurl=["../../static/img/home.png","../../static/img/baoyang.png","../../static/img/fenleisel.png","../../static/img/wode.png"]; 
+                    break;
+                case 4:
+                    this.imgurl=["../../static/img/home.png","../../static/img/baoyang.png","../../static/img/fenlei.png","../../static/img/wodesel.png"]; 
+                    break;
+            }
+    },
+    methods:{
+        tz(e){
+            this.imgurl=["../../static/img/home.png","../../static/img/baoyang.png","../../static/img/fenlei.png","../../static/img/wode.png"]
+            console.log(e.currentTarget.dataset.tab)
+            switch(e.currentTarget.dataset.tab){
+                case "1":
+                    this.imgurl[0]="../../static/img/homesel.png";
+                   uni.reLaunch({
+                        url:"/pages/index/index"
+                   })
+                    break;
+                case "2":
+                    this.imgurl[1]="../../static/img/baoyangsel.png"; 
+                    uni.navigateTo({
+                        url:"/pages/choosebaoyang/choosebaoyang"
+                    })
+                    break;
+                case "3":
+                    this.imgurl[2]="../../static/img/fenleisel.png"; 
+                    uni.reLaunch({
+                        url:"/pages/type/type"
+                    })
+                    break;
+                case "4":
+                    this.imgurl[3]="../../static/img/wodesel.png";
+                    uni.reLaunch({
+                        url:"/pages/mine/mine"
+                    })
+                    break;
+            }
+        }
+    }
+}
+</script>
+
+<style lang="scss">
+.tabbar{
+    display: flex;
+    justify-content: space-around;
+    .logo{
+        width: 48upx;
+        height:48upx;
+    }
+    .nav{
+        color: #545454;
+        font-size: 24upx;
+    }
+}
+</style>
\ No newline at end of file
diff --git a/src/components/xzcxlist/popup.vue b/src/components/xzcxlist/popup.vue
new file mode 100644
index 0000000..fd8d80b
--- /dev/null
+++ b/src/components/xzcxlist/popup.vue
@@ -0,0 +1,248 @@
+<template>
+  <view v-if="openSync">
+
+    <view class="popup-mask" :style="{'opacity': show ? '1' : '0'}" @click="positionSync == 'ad' ? '' : close()"></view>
+
+    <view v-if="positionSync == 'center' || positionSync == 'ad'" class="popup popup-center" :class="{'popup-center-dec': positionSync == 'ad'}">
+      <view class="popup-center-transStart" :class="{
+        'popup-center-border': positionSync != 'ad' || background != 'none',
+        'popup-center-transEnd': show
+        }"
+        :style="{'background': background}">
+        <scroll-view scroll-y class="popup-transStart" :style="{
+          'width': size.width, 
+          'height': size.height,
+          'max-height': size.maxHeight
+        }">
+          <slot />
+        </scroll-view>
+        <view v-if="positionSync == 'ad'" class="popup-close" @click="close"></view>
+      </view>
+    </view>
+
+    <scroll-view v-else scroll-x scroll-y class="popup popup-transStart" :class="{
+        'popup-top': positionSync == 'top',
+        'popup-bottom': positionSync == 'bottom',
+        'popup-left': positionSync == 'left',
+        'popup-right': positionSync == 'right',
+        'popup-transEnd': show
+      }"
+      :style="{
+        'background': background,
+        'width': size.width,
+        'height': size.height,
+        'max-width': size.maxWidth
+      }">
+      <slot />
+    </scroll-view>
+
+  </view>
+</template>
+
+<script>
+  export default {
+    props: {
+      open: {
+        type: Boolean,
+        default: false
+      },
+
+      //center top bottom left right ad (初始化有效)
+      position: {
+        type: String,
+        default: 'center'
+      },
+
+      // 宽高百分比 center top bottom ad 对应高度 left right对应宽度
+      // 默认为自适应
+      percent: Number,
+
+      background: {
+        type: String,
+        default: '#fff'
+      },
+    },
+
+    data() {
+      return {
+        openSync: false,
+        positionSync: String,
+        show: false,
+        size: Object
+      }
+    },
+
+    onLoad: function() {
+      this.size = this._size();
+      this.openSync = this.open;
+      this.positionSync = this.position;
+      setTimeout(() => {
+        this.show = this.open;
+      }, 100)
+    },
+
+    watch: {
+      open: function(val) {
+        this.size = this._size();
+        this.openSync = val;
+        this.positionSync = this.position;
+        setTimeout(() => {
+          this.show = val;
+        }, 100)
+      },
+      percent: function() {
+        this.size = this._size();
+      }
+    },
+
+    methods: {
+      close: function() {
+        this.show = false;
+        setTimeout(() => {
+          this.openSync = false;
+          this.$emit('close');
+        }, 300)
+      },
+
+      _size: function() {
+        let sysInfo = uni.getSystemInfoSync();
+        let width, height, maxWidth, maxHeight;
+        let heightPositions = ['center', 'top', 'bottom', 'ad'];
+        if (heightPositions.includes(this.position)) {
+          width = '100%';
+          if (this.percent > 0) {
+            height = sysInfo.windowHeight * (this.percent / 100) + 'px';
+          } else {
+            height = 'auto';
+            maxHeight = sysInfo.windowHeight * (60 / 100) + 'px';
+          }
+        } else {
+          height = '100%';
+          if (this.percent > 0) {
+            width = sysInfo.windowWidth * (this.percent / 100) + 'px';
+          } else {
+            width = 'auto';
+            maxWidth = sysInfo.windowWidth * (80 / 100) + 'px';
+          }
+        }
+        return {
+          width: width,
+          height: height,
+          maxWidth: maxWidth,
+          maxHeight: maxHeight
+        }
+      },
+
+      _moveHandle: function() {}
+    }
+  }
+</script>
+
+<style>
+  .popup-mask {
+    opacity: 0;
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    background: rgba(0, 0, 0, .6);
+    transition: opacity .3s;
+    z-index: 1000;
+  }
+
+  .popup {
+    position: fixed;
+    z-index: 1001;
+  }
+
+  .popup-center {
+    left: 50%;
+    top: 50%;
+    transform: translate(-50%, -50%);
+    width: 90%;
+  }
+
+  .popup-center-dec {
+    margin-top: -90px;
+  }
+
+  .popup-center-border {
+    border-radius: 10upx;
+    padding: 20upx;
+  }
+
+  .popup-center-transStart {
+    opacity: 0;
+    transition: all .3s;
+    transform: scale(0.8);
+  }
+
+  /* CSS写在初始效果之后(否则渲染顺序原因无法覆盖之前效果) */
+  .popup-center-transEnd {
+    opacity: 1;
+    transform: scale(1);
+  }
+
+  .popup-top,
+  .popup-bottom {
+    left: 0;
+  }
+
+  .popup-top {
+    top: 0;
+    transform: translate(0, -100%);
+  }
+
+  .popup-bottom {
+    bottom: 0;
+    transform: translate(0, 100%);
+  }
+
+  .popup-left,
+  .popup-right {
+    top: 0;
+  }
+
+  .popup-left {
+    left: 0;
+    transform: translatex(-100%);
+  }
+
+  .popup-right {
+    right: 0;
+    transform: translatex(100%);
+  }
+
+  .popup-transStart {
+    transition: all .3s ease-out;
+  }
+
+  /* CSS写在初始效果之后(否则渲染顺序原因无法覆盖之前效果) */
+  .popup-transEnd {
+    transform: translate(0);
+  }
+
+  .popup-close {
+    position: absolute;
+    margin: auto;
+    left: 0;
+    right: 0;
+    bottom: -90px;
+    background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAACVElEQVRIS6VW0VHbQBDd1Z9vbyZQAVABpAJMBaaDQAUhFWAqCFQQUwF2BU4qiFNBnArizOikL99mnnJizqeTBURf0tzdvr19u++Jac+jqgfOuQkzX+KdiM7C9hUzb1R1LiILvPeF4dwCglVV9ZGIpvG6qn7DNzOfJ+emxpiHHFAHoK7r8Xa7fWJmZPyLme+ZeT4ajdZx0Lquj1UVN7shoiNVxS0urLWreN8OQFmWV8z8RVX/FEWBrO73lbBdq6rqxns/ZeZ3qnptrZ21a88AyNx7v0RwIhqnmQwBlWUJfr4GkPft+QYgkPkT5X1L8Ba8BUFIETkBJw2Acw5k3jLzp5eWpe9GKJeqfiaiOxGZcuiY3yBURI7jg2VZbpj5SUSucwGdczNVnVhrD+N15xwa4sgYc8gtsbnsEYCIPhDRLAWJ1n6ISDsfDU57CxDOzrk5EU2KojhJWzGUrwMSBzfGjNP+Rwt778HpAjcA8+cikh26FCSU4gqHjTFo6+wUO+cUgwkAbFhZa8f7WjHKGtseRQQgvQ8SJ6LTtwJ0OEmRAsDZa0v0GATvNEd80kn/SvQKkpuyhLZurt8HkpLc6M9Am+7UfAhkp02jQVtjvDODBs3vEBqDNAMVddPOoP2vVKAc8fx0pCISO4y35jR9SEkTsVtCNCE7z2KHDVBCZv7eZxxDIEFJlzAqVd2V6yiD1nA2wXAehgK32uO9hxojeN5wUk2HcRDROljmoscyJ8EyYZ9Zo9pn+vDa2/gGqor+h+mnsnIHH3mR6ScB8dtyOfDbMt/32/IXtIjJp6aB1ZUAAAAASUVORK5CYII=);
+    width: 24px;
+    height: 24px;
+  }
+
+  .popup-close:after {
+    content: '';
+    position: absolute;
+    width: 0px;
+    border: 1px #F5F5F5 solid;
+    top: -66px;
+    bottom: 24px;
+    left: 50%;
+    transform: translate(-50%, -0%);
+    opacity: 0.8;
+  }
+</style>
diff --git a/src/components/xzcxlist/xzcxlist-cars.vue b/src/components/xzcxlist/xzcxlist-cars.vue
new file mode 100644
index 0000000..875a592
--- /dev/null
+++ b/src/components/xzcxlist/xzcxlist-cars.vue
@@ -0,0 +1,52 @@
+<template>
+  <view class="xzcxlistCars">
+      <view class="car">
+          <img  :src="carpic" alt="" class="caricon">
+          <view class="carname"> {{carname}}</view>
+      </view>
+      <view class="line"></view>
+  </view>
+</template>
+
+<script>
+export default {
+name:"xzcxlistCars",
+props:{
+    carpic:{
+        type:String
+    },
+    carname:{
+        type:String
+    }
+}
+}
+</script>
+
+<style lang="scss">
+.xzcxlistCars{
+    height: 101upx;
+    width: 100%;
+    .car{
+        display: flex;
+        width: 615upx;
+        .caricon{
+            width: 71upx;
+            height: 71upx;
+            margin-right:33upx;
+            margin-top: 10upx;
+            margin-left: 26upx;
+        }
+        .carname{
+            color: #3C3A3C;
+            font-size: 26upx;
+            line-height: 88upx;
+        }
+    }
+    .line{
+        width: 624upx;
+        height: 2upx;
+        background-color: #D9D9D9;
+        float: right
+    }
+}
+</style>
\ No newline at end of file
diff --git a/src/components/xzcxlist/xzcxlist-icon.vue b/src/components/xzcxlist/xzcxlist-icon.vue
new file mode 100644
index 0000000..0df6cde
--- /dev/null
+++ b/src/components/xzcxlist/xzcxlist-icon.vue
@@ -0,0 +1,38 @@
+<template>
+    <view class="xzcxlistIcon">
+        <img  :src="carpic" alt="" class="icon">
+        <view class="carname">{{carname}}</view>
+    </view>
+</template>
+
+<script>
+export default {
+name:"xzcxlistIcon",
+props:{
+    carname:{
+        type:String
+    },
+    carpic:{
+        type:String
+    }
+}
+}
+</script>
+
+<style lang="scss">
+.xzcxlistIcon{
+width:75upx;
+height: 106upx;
+.icon{
+    width: 75upx;
+    height: 75upx;;
+}
+.carname{   
+    width: 75upx;
+    color: #3C3A3C;
+    font-size: 21upx;
+    text-align: center;
+    margin-top: 11upx;
+}
+}
+</style>
\ No newline at end of file
diff --git a/src/components/xzcxlist/xzcxlist-iconlist.vue b/src/components/xzcxlist/xzcxlist-iconlist.vue
new file mode 100644
index 0000000..5efe864
--- /dev/null
+++ b/src/components/xzcxlist/xzcxlist-iconlist.vue
@@ -0,0 +1,53 @@
+<template>
+  <view class="xzcxlistIconlist">
+    <view v-for="(i,j) in iconlist" :key="j"  class="icon" @click="xuanzhong(i)">
+    <xzcxlistIcon :carpic="i.brand_logo" :carname="i.brand_name" class="icon"></xzcxlistIcon>
+
+    </view>
+    <!-- <xzcxlistIcon carpic="../../static/img/caricon1.png" carname="大众" class="icon"></xzcxlistIcon>
+    <xzcxlistIcon carpic="../../static/img/caricon1.png" carname="大众" class="icon"></xzcxlistIcon>
+    <xzcxlistIcon carpic="../../static/img/caricon1.png" carname="大众" class="icon"></xzcxlistIcon>
+    <xzcxlistIcon carpic="../../static/img/caricon1.png" carname="大众" class="icon"></xzcxlistIcon>
+    <xzcxlistIcon carpic="../../static/img/caricon1.png" carname="大众" class="icon"></xzcxlistIcon>
+    <xzcxlistIcon carpic="../../static/img/caricon1.png" carname="大众" class="icon"></xzcxlistIcon>
+    <xzcxlistIcon carpic="../../static/img/caricon1.png" carname="大众" class="icon"></xzcxlistIcon> -->
+  </view>
+</template>
+
+<script>
+import xzcxlistIcon from "../../components/xzcxlist/xzcxlist-icon";
+export default {
+  name: "xzcxlistIconList",
+  components: {
+    xzcxlistIcon
+  },
+  props:{
+    iconlist:{
+      type:Array
+    }
+  },
+  methods:{
+    xuanzhong(i){
+      this.$emit("xuanzhong",i)
+    }
+  }
+};
+</script>
+
+<style lang="scss">
+.xzcxlistIconlist {
+    width: 649upx;
+  // height: 283upxx;
+  display: flex;
+  flex-wrap: wrap;
+  margin: 0 auto;
+  justify-content: space-between;
+  .icon{
+      margin-right:69upx;
+      height: 170rpx;
+margin-top: 27rpx;
+
+      // margin-top: 44upx;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/components/xzcxlist/xzcxlist-title.vue b/src/components/xzcxlist/xzcxlist-title.vue
new file mode 100644
index 0000000..364ef7b
--- /dev/null
+++ b/src/components/xzcxlist/xzcxlist-title.vue
@@ -0,0 +1,29 @@
+<template>
+  <view class="xzcxlistTitle">
+      {{title}}
+  </view>
+</template>
+
+<script>
+export default {
+name:'xzcxlistTitle',
+props:{
+    title:{
+        type:String
+    }
+}
+}
+</script>
+
+<style lang="scss">
+.xzcxlistTitle{
+    height: 52upx;
+    background-color: #F0EEEF;
+    color: #3C3A3C;
+    font-size: 22upx;
+    line-height: 52upx;
+    text-indent: 30upx;
+    position: relative;
+    top:50upx;
+}
+</style>
\ No newline at end of file
diff --git a/src/components/xzcxlist/xzpinpai.vue b/src/components/xzcxlist/xzpinpai.vue
new file mode 100644
index 0000000..f0f75b9
--- /dev/null
+++ b/src/components/xzcxlist/xzpinpai.vue
@@ -0,0 +1,136 @@
+<template>
+  <!-- <view class="box"> -->
+         <popup :open="open" :position="position" :percent="percent" :background="background" @close="openPopup = false">
+    <view class="xzpinpai">
+      <view class="top">
+        <img src="../../static/img/caricon.png" alt class="caricon" />
+        <text class="carname"></text>
+      </view>
+      <view class="chexi"></view>
+      <view class="chexilist">智障</view>
+      <view class="line"></view>
+    </view>
+         </popup>
+  <!-- </view> -->
+</template>
+
+<script>
+import popup from '../../components/xzcxlist/popup';
+export default {
+  name: "xzpinpai", 
+    data(){
+        return{
+             openPopup: false,
+        position: '',
+        background: '#fff',
+        openAdPopup: false,
+        percent: 0,
+        showText: false,
+        change: false,
+        loopTimer: false,
+        sizeSort: 'asc'
+        }
+    },
+      methods: {
+      open: function(position) {
+        this.position = position;
+        this.openPopup = true;
+      },
+      touchend: function() {
+        clearInterval(this.loopTimer)
+      },
+      changeBgColor: function(e) {
+        clearInterval(this.loopTimer);
+        this.loopTimer = setInterval(() => {
+          let r = Math.floor(Math.random() * 256);
+          let g = Math.floor(Math.random() * 256);
+          let b = Math.floor(Math.random() * 256);
+          let color = '#' + r.toString(16) + g.toString(16) + b.toString(16);
+          this.background = color
+        }, 300)
+      },
+      changeSize: function() {
+        clearInterval(this.loopTimer);
+        this.loopTimer = setInterval(() => {
+          let percents = [40, 45, 50, 55, 60, 65, 70, 75, 80];
+
+          if (this.percent <= 40) this.sizeSort = 'asc';
+          if (this.percent >= 80) this.sizeSort = 'desc';
+          if (this.sizeSort == 'desc') percents = percents.reverse();
+
+          for (let i = 0; i <= percents.length; i++) {
+            if (this.sizeSort == 'desc') {
+              if (this.percent > percents[i]) {
+                this.percent = percents[i];
+                break;
+              }
+            } else {
+              if (this.percent < percents[i]) {
+                this.percent = percents[i];
+                break;
+              }
+            }
+          }
+        }, 200)
+      },
+      reset: function() {
+        this.percent = 0;
+        this.background = '#fff';
+        this.showText = false;
+      }
+    },
+  components:{
+      popup
+  }
+};
+</script>
+
+<style lang="scss">
+.box{
+    width:750upx;
+    height:100%;
+    background-color: rgba(126, 126, 126, 0.8);
+      position: absolute;
+  top: 0;
+}
+.xzpinpai {
+  width: 618upx;
+  height: 100%;
+  background-color: white;
+  position: absolute;
+  top: 0;
+  right: 0;
+  .top {
+    height: 93upx;
+    .caricon {
+      width: 92upx;
+      height: 53upx;
+      margin: auto 0;
+    }
+    .carname {
+      color: #1d1d1d;
+      font-size: 28upx;
+      line-height: 53upx;
+    }
+  }
+  .chexi {
+    height: 59upx;
+    width: 100%;
+    background-color: #f0efed;
+    line-height: 59upx;
+    text-indent: 30upx;
+    color: #666666;
+    font-size: 22upx;
+  }
+  .chexilist {
+    height: 85upx;
+    width: 100%;
+  }
+  .line {
+    width: 590upx;
+    height: 2upx;
+    background-color: #d9d9d9;
+    margin-left: 28upx;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/pages.json b/src/pages.json
index bf32f65..bc2eb49 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -5,6 +5,12 @@
 			"style": {
 				"navigationBarTitleText": "uni-app"
 			}
+		},
+		{
+			"path": "pages/addr-add/addr-add",
+			"style": {
+				"navigationBarTitleText": "uni-app"
+			}
 		}
 	],
 	"globalStyle": {
@@ -13,4 +19,4 @@
 		"navigationBarBackgroundColor": "#F8F8F8",
 		"backgroundColor": "#F8F8F8"
 	}
-}
+}
diff --git a/src/pages/addr-add/addr-add.vue b/src/pages/addr-add/addr-add.vue
new file mode 100644
index 0000000..901dd2f
--- /dev/null
+++ b/src/pages/addr-add/addr-add.vue
@@ -0,0 +1,75 @@
+<template>
+  <view>
+    <addrAdd v-model="from.uname" desc="收货人姓名"></addrAdd>
+    <addrAdd v-model="from.phone" desc="手机号码"></addrAdd>
+    <addrAdd v-model="from.address" desc="收货地址"></addrAdd>
+    <view @click="tijiao" class="btn">
+      <chooseaddrBtn1></chooseaddrBtn1>
+    </view>
+  </view>
+</template>
+<script>
+import addrAdd from "../../components/addr/addr-add";
+import chooseaddrBtn1 from "../../components/chooseaddr/chooseaddr-btn1";
+import { requestP } from "../../static/js/request";
+export default {
+  components: {
+    addrAdd,
+    chooseaddrBtn1
+  },
+  data() {
+    return {
+      from: {}
+    };
+  },
+  methods: {
+    tijiao() {
+      if (this.from.id) {
+        requestP({
+          url: "user/update_user_address",
+          data: this.from
+        }).then(res => {
+          console.log(res);
+          uni.showToast({
+            title: "修改成功",
+            duration: 2000,
+            icon: "success"
+          });
+          uni.navigateTo({
+            url:"/pages/chooseaddr/chooseaddr"
+          })
+        });
+      } else {
+        requestP({
+          url: "user/add_user_address",
+          data: this.from
+        }).then(res => {
+          console.log(res);
+          uni.showToast({
+            title: "添加成功",
+            duration: 2000,
+            icon: "success"
+          });
+            uni.navigateTo({
+            url:"/pages/chooseaddr/chooseaddr"
+          })
+        });
+        
+      }
+    }
+  },
+  onLoad(a) {
+    if (a.id) {
+      this.from = uni.getStorageSync("address");
+      this.from.address_id = this.from.id;
+    }
+  }
+};
+</script>
+<style lang="scss">
+.btn {
+  position: fixed;
+  bottom: 14upx;
+  left: 31upx;
+}
+</style>
\ No newline at end of file
diff --git a/src/pages/assess-detail/assess-detail.vue b/src/pages/assess-detail/assess-detail.vue
new file mode 100644
index 0000000..b602325
--- /dev/null
+++ b/src/pages/assess-detail/assess-detail.vue
@@ -0,0 +1,27 @@
+<template>
+  <view class="assess-detail">
+       <assessList
+      pingfen="5.01"
+      username="M***A"
+      proname="大众 途观"
+      date="2019.08.22"
+      detail="维修师傅态度很好，问的问题多余给你解释很棒，维修师傅态度很好，问的问题多余给你解释很棒，下次保养还回来！维修师傅态度很好，问的问题多余···"
+      shop="养车工厂店"
+      shoppic="../../static/img/shoppic1.png"
+      stars="4"
+    ></assessList>
+  </view>
+</template>
+
+<script>
+import assessList from "../../components/assess/assess-list"
+export default {
+components:{
+    assessList
+}
+}
+</script>
+
+<style>
+
+</style>
\ No newline at end of file
diff --git a/src/pages/assess/assess.vue b/src/pages/assess/assess.vue
new file mode 100644
index 0000000..e78a4d2
--- /dev/null
+++ b/src/pages/assess/assess.vue
@@ -0,0 +1,65 @@
+<template>
+  <view class="assess">
+    <!-- <assessTop  v-on:changes="lx"></assessTop> -->
+    <!-- <view v-if="leixing==2">
+          <assessList username="M***A" proname="大众 途观" date="2019.08.22" detail="维修师傅态度很好，问的问题多余给你解释很棒，维修师傅态度很好，问的问题多余给你解释很棒，下次保养还回来！维修师傅态度很好，问的问题多余···" shop="养车工厂店" shoppic="../../static/img/shoppic1.png" stars=4></assessList>
+    <assessList username="M***A" proname="大众 途观" date="2019.08.22" detail="维修师傅态度很好，问的问题多余给你解释很棒，维修师傅态度很好，问的问题多余给你解释很棒，下次保养还回来！维修师傅态度很好，问的问题多余···" shop="养车工厂店" shoppic="../../static/img/shoppic1.png" stars=4></assessList>
+    </view>-->
+    <!-- <view v-if="leixing==1">
+        mbiofjbiohjbi 
+    </view>-->
+    <view v-for="(item,j) in pingjia" :key="j">
+     <assessList
+      :pingfen="item.xing"
+      :username="item.uname"
+      :userpic="item.avatar_url"
+      proname="大众 途观"
+      :date="item.pingjia_time"
+      :detail="item.comment"
+      :buydate="item.pay_time"
+      shoppic="../../static/img/shoppic1.png"
+:stars="item.xing"
+      :pinglunpic="item.imgs"
+    ></assessList>
+    </view>
+  </view>
+</template>
+
+<script>
+import assessTop from "../../components/assess/assess-top";
+import assessList from "../../components/assess/assess-list";
+import { requestP } from "../../static/js/request";
+export default {
+  data() {
+    return {
+      leixing: 1,
+      pingjia:[]
+    };
+  },
+  methods: {
+    lx(e) {
+      console.log(e);
+      this.leixing = e;
+    }
+  },
+  onLoad(e) {
+    requestP({
+      url: "goods/get_pingjia_list",
+      data:{
+        goods_id:e.shopid,
+        page:0
+      }
+    }).then(res => {
+      console.log(res)
+      this.pingjia = res.data.data.list;
+    });
+  },
+  components: {
+    assessTop,
+    assessList
+  }
+};
+</script>
+
+<style lang="scss">
+</style>
diff --git a/src/pages/ceshi/ceshi.vue b/src/pages/ceshi/ceshi.vue
new file mode 100644
index 0000000..8b3676f
--- /dev/null
+++ b/src/pages/ceshi/ceshi.vue
@@ -0,0 +1,23 @@
+<template>
+  <view>
+      <ceshi></ceshi>
+      <xzpinpai class="pinpai"></xzpinpai>
+  </view>
+</template>
+
+<script>
+import ceshi from "../../components/ceshi/ceshi"
+import xzpinpai from "../../components/xzcxlist/xzpinpai"
+export default {
+    components:{
+        ceshi,
+        xzpinpai    
+    },
+}
+</script>
+
+<style lang="scss">
+.pinpai{
+
+}
+</style>
\ No newline at end of file
diff --git a/src/pages/changecar/changecar.vue b/src/pages/changecar/changecar.vue
new file mode 100644
index 0000000..e63cbe3
--- /dev/null
+++ b/src/pages/changecar/changecar.vue
@@ -0,0 +1,66 @@
+<template>
+  <view>
+    <label v-for="(item,index)  in items" :key="item.value">
+      <view>
+        <changecarCar val="item.name" :index="index" data-current="item.id" :ids="items" v-on:pChangeType="select"></changecarCar>
+      </view>
+    </label>
+  </view>  
+</template>
+
+<script>
+import changecarCar from "../../components/changecar/changecar-car";
+export default {
+  components: {
+    changecarCar
+  },
+  data() {
+    return {
+      items: [
+        {
+          value: "USA",
+          name: "美国",
+          id: 0
+        },
+        {
+          value: "CHN",
+          name: "中国",
+          checked: "true",
+          id: 1
+        },
+        {
+          value: "BRA",
+          name: "巴西",
+          id: 2
+        }
+      ],
+      current: 0
+    };
+  },
+  methods: {
+    onLoad() {
+
+    },
+     xz: function(e) {
+      console.log(1111);    
+      console.log(e)
+      for (var i = 0; i < this.items.length; i++) {
+        console.log(i == e.currentTarget.dataset.current)
+        
+        // if (i == this.current) {
+        //   this.ifxz = true;
+        //   console.log(552);
+        // }else{
+        //   this.ifxz=fasle
+        // }
+      }
+    },
+    select(){
+      console.log(200)
+    }
+  }
+};
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/src/pages/chooseaddr/chooseaddr.vue b/src/pages/chooseaddr/chooseaddr.vue
new file mode 100644
index 0000000..8c3c934
--- /dev/null
+++ b/src/pages/chooseaddr/chooseaddr.vue
@@ -0,0 +1,115 @@
+<template>
+  <view>
+    <view class="midbox">
+        <scroll-view :scroll-y="true" class="scroll-Y" @scroll="scroll" @click.stop="a">
+      <view v-for="(i,j) in list" :key="j" @click="xz(j,i.id)" :data-addrid="i.id" @longtap='del'>
+        <chooseaddrInfo
+          :name="i.uname"
+          :address="i.address"
+          :phone="i.phone"
+          :defined="i.status"
+          :aid="i.id"
+          @addid="addid(j)"
+  
+        ></chooseaddrInfo>
+      </view>
+        </scroll-view>
+    </view>
+
+    <view class="btn">
+      <!-- <chooseaddrBtn class="btn1"></chooseaddrBtn> -->
+      <view @click="tianjia">
+      <chooseaddrBtn1 ifadd="true"></chooseaddrBtn1>
+      </view>
+    </view>
+  </view>
+</template>
+<script>
+import chooseaddrInfo from "../../components/chooseaddr/chooseaddr-info";
+import chooseaddrBtn from "../../components/chooseaddr/chooseaddr-btn";
+import chooseaddrBtn1 from "../../components/chooseaddr/chooseaddr-btn1";
+import { requestP } from "../../static/js/request";
+export default {
+  components: {
+    chooseaddrInfo,
+    chooseaddrBtn,
+    chooseaddrBtn1
+  },
+  data() {
+    return {
+      list: [],
+      addrid: 0,
+      canshu: {}
+    };
+  },
+  mounted() {
+    requestP({
+      url: "user/get_user_address"
+    }).then(res => {
+      console.log(res.data.data[0].id);
+      this.list = res.data.data;
+    });
+  },
+  onLoad(e) {
+    console.log(e, 7945455);
+    this.canshu = e;
+  },
+  methods: {
+    a(){},
+    scroll(){},
+    xz(a,b) {
+      console.log(a)
+      console.log(b);
+      this.addrid = b
+      
+      uni.navigateTo({
+        url:
+          "/pages/order-sub/order-sub?addrid=" +
+          this.addrid +
+          "&guige=" +
+          this.canshu.guige +
+          "&num=" +
+          this.canshu.num +
+          "&shopid=" +
+          this.canshu.shopid +
+          "&shoptype=" +
+          this.canshu.shoptype +
+          "&msid=" +
+          this.canshu.msid+"&addrkey="+a
+      });
+    },
+    del(e){
+      console.log(e,"long") 
+    },
+    addid(e){
+      uni.setStorageSync("address",this.list[e])
+      uni.navigateTo({
+        url:"../addr-add/addr-add?id=" + 1
+      })
+      
+    },
+    tianjia(){
+      uni.navigateTo({
+        url:"../addr-add/addr-add"
+      })
+    }
+  }
+};
+</script>
+<style lang="scss">
+.midbox{
+  height:1100upx;
+}
+.scroll-Y{
+  height: 90%;
+}
+.btn {
+  position: fixed;
+  bottom: 14upx;
+  left: 29upx;
+  .btn1 {
+    position: relative;
+    bottom: 27upx;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/pages/choosebaoyang/choosebaoyang.vue b/src/pages/choosebaoyang/choosebaoyang.vue
new file mode 100644
index 0000000..54b04c9
--- /dev/null
+++ b/src/pages/choosebaoyang/choosebaoyang.vue
@@ -0,0 +1,243 @@
+<template>
+  <view>
+    <choosebaoyangTop :carlist="carlist" @cheming="cheming" @input="input"></choosebaoyangTop>
+    <view v-for="(i,j) in baoyanglist" :key="j">
+      <choosebaoyangTitle :title0="i.name"></choosebaoyangTitle>
+      <view v-for="(m,n) in i.erji" :key="n" @click="showshops(j,n)">
+        <choosebaoyangService
+          :ifxz="ifshop[j][n]"
+          :pri="m.money"
+          :serveName="m.name"
+          serveDesc="5000km或6个月/次"
+        ></choosebaoyangService>
+         <view v-if="ifshop[j][n]">
+            <view v-if="m.goods.length==0">
+            <choosebaoyangServedetail class="servedetail"></choosebaoyangServedetail>
+          </view>
+            <shopserviceShop
+            v-for="(item,index) in m.goods" :key="index"
+              :shoppic="item.imgpaththumb"
+              :shopname="item.goods_name"
+              :pri="item.price"
+              :num="item.goods_num"
+              v-else
+            ></shopserviceShop>
+           
+           
+          </view>
+         
+          <view class="line"></view>
+      </view>
+    </view>
+    <!-- <choosebaoyangTitle title0="常规保养项目(1/5)"></choosebaoyangTitle>
+   <view @click="showshops(0)">
+       <choosebaoyangService :ifxz="ifshop[0]" pri="78.04" serveName="小保养服务" serveDesc="5000km或6个月/次"></choosebaoyangService>
+    </view>
+     <view v-if="ifshop[0]">
+    <choosebaoyangServedetail class="servedetail"></choosebaoyangServedetail>
+     </view>
+    <view class="line"></view>-->
+    <!-- <view @click="showshops(0)">
+       <choosebaoyangService :ifxz="ifshop[0]" pri="78.04" serveName="小保养服务" serveDesc="5000km或6个月/次"></choosebaoyangService>
+    </view>
+    <view class="line"></view>
+    <view v-if="ifshop[0]">
+      <shopserviceShop shoppic="../../static/img/serviceshop.png" shopname="轮胎/汽车轮胎 205/55R16 91V 韧悦 ENERGY XM2 " pri=65 num=2></shopserviceShop>
+    </view>
+    <view class="line"></view>
+    <view @click="showshops(1)">
+       <choosebaoyangService  :ifxz="ifshop[1]" pri="78.04" serveName="小保养服务" serveDesc="5000km或6个月/次"></choosebaoyangService>
+    </view>
+      <view v-if="ifshop[1]">
+      <shopserviceShop shoppic="../../static/img/serviceshop.png" shopname="轮胎/汽车轮胎 205/55R16 91V 韧悦 ENERGY XM2 " pri=65 num=2></shopserviceShop>
+    </view>
+    <view class="line"></view>
+  <view @click="showshops(2)">
+       <choosebaoyangService :ifxz="ifshop[2]" pri="78.04" serveName="小保养服务" serveDesc="5000km或6个月/次"></choosebaoyangService>
+    </view>
+      <view v-if="ifshop[2]">
+      <shopserviceShop shoppic="../../static/img/serviceshop.png" shopname="轮胎/汽车轮胎 205/55R16 91V 韧悦 ENERGY XM2 " pri=65 num=2></shopserviceShop>
+    </view>
+    <view class="line"></view>
+   <view @click="showshops(3)">
+       <choosebaoyangService :ifxz="ifshop[3]" pri="78.04" serveName="小保养服务" serveDesc="5000km或6个月/次"></choosebaoyangService>
+    </view>
+      <view v-if="ifshop[3]">
+      <shopserviceShop shoppic="../../static/img/serviceshop.png" shopname="轮胎/汽车轮胎 205/55R16 91V 韧悦 ENERGY XM2 " pri=65 num=2></shopserviceShop>
+    </view>
+    <view class="line"></view>
+    <choosebaoyangService pri="78.04" serveName="前雨刷" serveDesc="1个月/次"></choosebaoyangService>-->
+
+    <!-- <choosebaoyangTitle title0="空调系统养护(0/2)"></choosebaoyangTitle>
+
+    <choosebaoyangService pri="78.04" serveName="空调管路杀菌" serveDesc="10000km或12个月/次"></choosebaoyangService>
+    <view class="line"></view>
+        <choosebaoyangService pri="78.04" serveName="蒸发箱清洗" serveDesc="10000km或12个月/次"></choosebaoyangService>
+    <choosebaoyangTitle title0="冷却系统养护(0/1)"></choosebaoyangTitle>
+    <choosebaoyangService pri="78.04" serveName="水箱防锈保护" serveDesc="24个月/次"></choosebaoyangService>
+    <choosebaoyangTitle title0="引擎深度养护(0/1)"></choosebaoyangTitle>
+    <choosebaoyangService pri="78.04" serveName="喷油嘴清洗" serveDesc="20000km或24个月/次"></choosebaoyangService>
+    <view class="line"></view>
+    <choosebaoyangService pri="78.04" serveName="进气系统清洗" serveDesc="20000km或24个月/次"></choosebaoyangService>
+    <view class="line"></view>
+    <choosebaoyangService pri="78.04" serveName="三元催化清洗" serveDesc="20000km或24个月/次"></choosebaoyangService>
+    <view class="line"></view>-->
+    <view>
+      <choosebaoyangBottom :price="money" class="bottom" @jiesuan="jiesuan"></choosebaoyangBottom>
+    </view>
+    <!-- <view class="tabbar">
+			<tabbar page=2></tabbar>
+    </view>-->
+  </view>
+</template>
+
+<script>
+import choosebaoyangTop from "../../components/choosebaoyang/choosebaoyang-top";
+import choosebaoyangTitle from "../../components/choosebaoyang/choosebaoyang-title";
+import choosebaoyangService from "../../components/choosebaoyang/choosebaoyang-service";
+import choosebaoyangServedetail from "../../components/choosebaoyang/choosebaoyang-servedetail";
+import choosebaoyangBottom from "../../components/choosebaoyang/choosebaoyang-bottom";
+import shopserviceShop from "../../components/shopservice/shopservice-shop";
+import { requestP } from "../../static/js/request";
+import tabbar from "../../components/tabbar/tabbar";
+export default {
+  components: {
+    choosebaoyangTop,
+    choosebaoyangTitle,
+    choosebaoyangService,
+    choosebaoyangServedetail,
+    choosebaoyangBottom,
+    shopserviceShop,
+    tabbar
+  },
+  data() {
+    return {
+      ifshop: [[]],
+      carlist: [],
+      form: {},
+      carid: 0,
+      baoyanglist: [],
+      money:0
+    };
+  },
+  onLoad() {
+    requestP({
+      url: "user_car/get_car_list"
+    }).then(res => {
+      let carlist = [];
+      for (let i in res.data.data) {
+        carlist.push(res.data.data[i].car_name);
+      }
+      console.log(carlist);
+      // console.log(this.ifshop)
+      this.carlist = res.data.data;
+      this.carid = this.carlist[0].car_id
+      this.input("")
+    });
+  },
+  methods: {
+    jiesuan() {
+      // uni.navigateTo({
+      //   url: "/pages/order-sub/order-sub"
+      // });\
+      var d = []
+      for(let a in this.ifshop){
+        for(let b in this.ifshop[a]){
+          if(this.ifshop[a][b] == true){
+            for(let c in this.baoyanglist[a].erji[b].goods){
+              d.push(this.baoyanglist[a].erji[b].goods[c].baoyang_car_goods_id)
+            }
+          }
+        }
+      }
+      requestP({
+        url:"shop_cart/add_baoyang_goods_in_cart",
+        data:{
+          baoyang_car_goods_id:d.join(",")
+        }
+      }).then((res)=>{
+        uni.showToast({
+              title: "添加成功",
+              icon: "success",
+              duration: 2000
+            });
+      })
+      console.log(d.join(",get_baoyang_list"))
+    },
+    showshops(j, e) {
+      console.log(j, e, "qwsfd");
+      // this.ifshop[e]=this.ifshop[e]==false?true:false
+      this.$set(this.ifshop[j], e, this.ifshop[j][e] == false ? true : false);
+      console.log(this.ifshop);
+      if(this.ifshop[j][e]==true){
+        this.money=this.money+Number(this.baoyanglist[j].erji[e].money)
+      }else{
+         this.money=this.money-Number(this.baoyanglist[j].erji[e].money)
+      }
+      console.log(this.money+this.baoyanglist[j].erji[e].money,"llkkniok")
+      // this.money=this.money+this.baoyanglist[j][e].money
+      // for(let i in this.baoyanglist){
+      //   for(let m in this.baoyanglist[i].erji){
+      //     for(let n in this.ifshop){
+            
+      //     }
+      //      console.log(this.baoyanglist[i].erji[m].money,"pklolo")
+      //   }
+      
+      // }
+    },
+    cheming(e) {
+      console.log(e, 66699);
+      this.carid = e;
+    },
+    input(e) {
+      console.log(e, 4613);
+      this.licheng = e;
+      if (this.cheming) {
+        requestP({
+          url: "baoyang/get_baoyang_list",
+          data: {
+            car_id: this.carid,
+            licheng: e
+          }
+        }).then(res => {
+          console.log(res);
+          for (let i = 0; i < res.data.data.length; i++) {
+            this.ifshop.push([]);
+            for (let m in res.data.data[i].erji) {
+              this.ifshop[i].push(false);
+            }
+          }
+          this.baoyanglist = res.data.data;
+          console.log(this.ifshop);
+        });
+      }
+    }
+  }
+};
+</script>
+
+<style lang="scss">
+page {
+  background-color: #eeeeee;
+}
+.servedetail {
+  position: relative;
+  top: 1upx;
+}
+.line {
+  height: 8upx;
+  background-color: #eeeeee;
+}
+.bottom {
+  width: 100%;
+  position: fixed;
+  bottom: 0;
+}
+.tabbar {
+  width: 100%;
+  background-color: white;
+  position: fixed;
+  bottom: 0;
+}
+</style>
\ No newline at end of file
diff --git a/src/pages/choosechexing/choosechexing.vue b/src/pages/choosechexing/choosechexing.vue
new file mode 100644
index 0000000..3f33fa6
--- /dev/null
+++ b/src/pages/choosechexing/choosechexing.vue
@@ -0,0 +1,90 @@
+<template>
+<view>
+ <proyearCarinfo :carname="canshu.popname" :carpic="canshu.popimg"></proyearCarinfo>
+<proyearChoose1 desc="0.8L" ifarrow=true :cx="canshu.year"></proyearChoose1>
+<proyearChoosetitle desc="选择车型"></proyearChoosetitle>
+<view v-for="(i,j) in list" :key="j" @click="add(i.kuanxing_id)">
+  <proyearChoose1 ifline=true :desc="i.kuanxing"></proyearChoose1>
+</view>
+<!-- <proyearChoose ifline=true desc="1999年生产"></proyearChoose>
+<proyearChoose ifline=true desc="1999年生产"></proyearChoose>
+<proyearChoose ifline=true desc="1999年生产"></proyearChoose>
+<proyearChoose ifline=true desc="1999年生产"></proyearChoose>
+<proyearChoose ifline=true desc="1999年生产"></proyearChoose> -->
+</view>
+
+</template>
+<script>
+import proyearCarinfo from "../../components/proyear/proyear-carinfo";
+import proyearChoose1 from "../../components/proyear/proyear-choose1";
+import proyearChoosetitle from '../../components/proyear/proyear-choosetitle'
+import {requestP} from "../../static/js/request"
+export default {
+  components: {
+    proyearCarinfo,
+    proyearChoose1,
+    proyearChoosetitle
+  },
+  data(){
+    return {
+      list:[],
+        carname:[],
+      carpic:[],
+      canshu:{},
+      cx:true
+    }
+  },
+  methods:{
+    add(a){
+      console.log(a)
+      requestP({
+        url:"user_car/add_car",
+        data:{
+          brand_id:this.canshu.pinpaiid,
+          chexi_id:this.canshu.chexiid,
+          chexing_id:this.canshu.chexingid,
+          pailiang_id:this.canshu.pailiangid,
+          nianfen_id:this.canshu.year,
+          kuanxing_id:a
+        }
+      }).then((ers)=>{
+         uni.showToast({
+            title: "添加成功",
+            icon: "success",
+            duration: 2000
+          });
+          uni.reLaunch({
+            url:"/pages/mygarage/mygarage"
+          })
+      })
+    }
+  },
+  onLoad(e){
+    console.log(e,'uear')
+    this.canshu=e
+    requestP({
+      url:"car/get_kuanxing_list",
+      data:{
+        brand_id:e.pinpaiid,
+        chexi_id:e.chexiid,
+        chexing_id:e.chexingid,
+        pailiang_id:e.pailiangid,
+        nianfen_id:e.yearid
+      }
+    }).then((res)=>{
+      console.log(res)
+      this.list = res.data.data
+          // uni.showToast({
+          //   title: "添加成功",
+          //   icon: "success",
+          //   duration: 2000
+          // });
+          // uni.navigateTo({
+          //   url:"/pages/mygarage/mygarage"
+          // })
+    })
+  }
+};
+</script>
+<style lang="scss" scoped>
+</style>
\ No newline at end of file
diff --git a/src/pages/choosefdj/choosefdj.vue b/src/pages/choosefdj/choosefdj.vue
new file mode 100644
index 0000000..0218f59
--- /dev/null
+++ b/src/pages/choosefdj/choosefdj.vue
@@ -0,0 +1,73 @@
+<template>
+  <view>
+    <proyearCarinfo :carname="carname" :carpic="carpic"></proyearCarinfo>
+    <proyearChoosetitle desc="选择发动机排量"></proyearChoosetitle>
+    <view v-for="(i,j) in list" :key="j" @click="toproyear(i.pailiang_id,i.pailiang)">
+      <proyearChoose ifline="true" :desc="i.pailiang"></proyearChoose>
+    </view>
+    <!-- <proyearChoose ifline=true desc="0.8L"></proyearChoose>
+     <proyearChoose ifline=true desc="0.8L"></proyearChoose>
+    <proyearChoose ifline=true desc="0.8L"></proyearChoose>-->
+  </view>
+</template>
+<script>
+import proyearCarinfo from "../../components/proyear/proyear-carinfo";
+import proyearChoose from "../../components/proyear/proyear-choose";
+import proyearChoosetitle from "../../components/proyear/proyear-choosetitle";
+import { requestP } from "../../static/js/request";
+export default {
+  components: {
+    proyearCarinfo,
+    proyearChoose,
+    proyearChoosetitle
+  },
+  data() {
+    return {
+      list: [],
+      title: [],
+      carname: [],
+      carpic: [],
+      canshu: {}
+    };
+  },
+  methods: {
+    toproyear(e,f) {
+      uni.navigateTo({
+        url:
+          "/pages/proyear/proyear?pailiangid=" +
+          e +
+          "&popname=" +
+          this.canshu.popname +
+          "&popimg=" +
+          this.canshu.popimg +
+          "&pinpaiid=" +
+          this.canshu.pinpaiid +
+          "&chexingid=" +
+          this.canshu.chexingid +
+          "&chexiid=" +
+          this.canshu.chexiid+"&pailiang="+f
+      });
+    }
+  },
+  onLoad(a) {
+    console.log(a, "fjd");
+    this.canshu = a;
+    this.carname = a.popname;
+    this.carpic = a.popimg;
+    requestP({
+      url: "car/get_pailiang_list",
+      data: {
+        brand_id: a.pinpaiid,
+        chexi_id: a.chexiid,
+        chexing_id: a.chexingid
+      }
+    }).then(res => {
+      console.log(res);
+      this.list = res.data.data;
+      // this.title = res.data.
+    });
+  }
+};
+</script>
+<style lang="scss">
+</style>
\ No newline at end of file
diff --git a/src/pages/choosesize/choosesize.vue b/src/pages/choosesize/choosesize.vue
new file mode 100644
index 0000000..bda258b
--- /dev/null
+++ b/src/pages/choosesize/choosesize.vue
@@ -0,0 +1,58 @@
+<template>
+  <view>
+    <view class="choosesize" >
+      <choosesizeTop v-on:changes="lx"></choosesizeTop>
+      <view v-if="leixing==2">
+        <choosesizeMid :type="leixing"></choosesizeMid>
+        <view class="search">
+          <choosesizeSearch></choosesizeSearch>
+        </view>
+      </view>
+    </view>
+    <view class="choosesizeChexing" v-if="leixing==1">
+      <choosesizeChexing></choosesizeChexing>
+    </view>
+  </view>
+</template>
+
+<script>
+import choosesizeTop from "../../components/choosesize/choosesize-top";
+import choosesizeMid from "../../components/choosesize/choosesize-mid";
+import choosesizeSearch from "../../components/choosesize/choosesize-search";
+import choosesizeChexing from "../../components/choosesize/choosesize-chexing";
+export default {
+  methods: {
+    onLoad() {
+      console.log(663634);
+    },
+
+    lx(e) {
+      console.log(e, 150);
+      this.leixing = e;
+    }
+  },
+  data() {
+    return {
+      leixing: 2
+    };
+  },
+  components: {
+    choosesizeTop,
+    choosesizeMid,
+    choosesizeSearch,
+    choosesizeChexing
+  }
+};
+</script>
+
+<style lang="scss">
+.choosesize {
+  background-color: white;
+}
+page {
+  background-color: #efefef;
+}
+.search {
+  margin-top: 82upx;
+}
+</style>
\ No newline at end of file
diff --git a/src/pages/comment/comment.vue b/src/pages/comment/comment.vue
new file mode 100644
index 0000000..43b1b8b
--- /dev/null
+++ b/src/pages/comment/comment.vue
@@ -0,0 +1,216 @@
+<template>
+    <view class="comment">
+        <view class="top">
+            <image class="touxiang" :src="tx"></image>
+            <view class="pingfen">
+                <image v-for="(i,j) in 5" :key="j" :src="j<fen?'../../static/img/xingz.png':'../../static/img/xingw.png'" @click="pingfen(j)"></image>
+                <!-- <image></image>
+                <image></image>
+                <image></image>
+                <image></image> -->
+            </view>
+        </view>
+        <view class="cent">
+            <textarea v-model="pingjia" class="text " name="" id="" maxlength="-1" placeholder="快来分享你的使用体验吧..."></textarea>
+            <view class="photo" style="margin-top:10upx">
+                <view class="img" v-for="(i,j) in img" :key="j">
+                    <image class="updateimg" :src="host + i">
+
+                    </image>
+                    <image class="x" src="../../static/img/delimg.png" @click="del(j)"></image>
+                </view>
+                <view class="update" @click="update" v-if="img.length<4">
+                    <image src="../../static/img/uphoto.png"></image>
+                    <view>{{img.length}}/4</view>
+                </view>
+            </view>
+        </view>
+        <view class="button" @click="fabu">
+            发           布
+        </view>
+    </view>
+</template>
+<style lang="scss" scoped>
+.comment{
+    .top{
+        display: flex;
+        align-items: center;
+        margin-left: 30upx;
+        margin-top: 30upx;
+ .touxiang{
+        width: 100upx;
+        height: 100upx;
+        // background-color: #000;
+    }
+    .pingfen{
+        >image{
+            width: 31upx;
+            height: 31upx;
+            margin-left: 20upx;
+        }
+        height: 31upx;
+        display: flex;
+    }
+    }
+    .cent{
+        margin-top: 28upx;
+        width: 100%;
+        border: 1upx solid #E6E6E6;
+        font-size: 24upx;
+        padding-top: 30upx;
+        padding-bottom: 20upx;
+
+        .text{
+            width: 690upx;
+            margin-left: 30upx;
+            height: 90upx;
+        }
+        .photo{
+            display: flex;
+            .update{
+                width: 150upx;
+                height: 150upx;
+                border: 1upx dashed #CCCCCC;
+                display: flex;
+                flex-direction: column;
+                align-items: center;
+                justify-content: center;
+                color: #CCCCCC;
+                font-size: 20upx;
+                margin-left: 30upx;
+                >image{
+                    width: 48upx;
+                    height: 40upx;
+                    margin-bottom: 20upx;
+                    
+                }
+            }
+            .img{
+               width: 150upx;
+                margin-left: 30upx;
+                height: 150upx;
+                position: relative;
+                .updateimg{
+                    width: 100%;
+                    height: 100%;
+                }
+                .x{
+                    width: 28upx;
+                    height: 28upx;
+                    position: absolute;
+                    left: 129upx;
+                    top:-9upx;
+                    // content: url('../../static/img/delimg.png')
+                }
+                // :before{
+                //     width: 28upx;
+                //     height: 28upx;
+                //     position: absolute;
+                //     left: 129upx;
+                //     top:9upx;
+                //     content: url('../../static/img/delimg.png')
+                // }
+            }
+        }
+    }
+    .button{
+        width: 550upx;
+        height: 72upx;
+        border-radius: 36upx;
+        background: #DF3347;
+        color: #fff;
+        font-size: 36upx;
+        line-height: 72upx;
+        text-align: center;
+        margin: 145upx auto 0 auto;
+    }
+   
+}
+</style>
+<script>
+import {requestP} from "../../static/js/request"
+export default {
+    data(){
+        return {
+            fen:1,
+            img:[],
+            host:"",
+            pingjian:"",
+            tx:"",
+            orderid:""
+        }
+    },
+    onLoad(e){
+            wx.getUserInfo({
+          success: res => {
+            console.log(res);
+            this.tx = res.userInfo.avatarUrl;
+            this.username = res.userInfo.nickName;
+            this.iflogin = true;
+          }
+        });
+        this.orderid=e.orderid
+
+    },
+    methods:{
+        update(){
+            var t =  this
+            var num = this.img.length
+            uni.chooseImage({
+                count: 4 - num, //默认9
+                // sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
+                // sourceType: ['album'], //从相册选择
+                success: function (res) {
+                    console.log(res.tempFilePaths);
+                    for(let i in res.tempFilePaths){
+                        uni.uploadFile({
+                            url: 'https://car.zgwl66.com/index.php/Api/goods/upimgdo', //仅为示例，非真实的接口地址
+                            filePath: res.tempFilePaths[i],
+                            name: 'image',
+                            formData: {
+                                'openid':  uni.getStorageSync("openid")
+                            },
+                            success: (uploadFileRes) => {
+                                // console.log(JSON.parse(uploadFileRes.data));
+                                var a = JSON.parse(uploadFileRes.data)
+                                t.img.push(a.path)
+                                t.host = a.host
+                            }
+                        }); 
+                    }
+                }
+            });
+        },
+        del(i){
+            console.log(i)
+            var a = this.img
+            a.splice(i,1)
+        },
+        pingfen(a){
+            this.fen = a + 1
+           
+        },
+        fabu(){
+             requestP({
+                url:"order/pingjia",
+                method:"post",
+                data:{
+                    order_id:this.orderid,
+                    xing:this.fen,
+                    comment:this.pingjia,
+                    imgs:this.img
+                }
+            }).then((res)=>{
+                 uni.showToast({
+              title: "发布成功",
+              icon: "success",
+              duration: 2000
+            });
+            uni.navigateTo({
+                url:"/pages/orderlist/orderlist"
+            })
+            })
+        }
+    }
+}
+</script>
\ No newline at end of file
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index 074985f..365aa05 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -1,42 +1,304 @@
 <template>
-	<view class="content">
-		<image class="logo" src="/static/logo.png"></image>
-		<view>
-			<text class="title">{{title}}</text>
-		</view>
-	</view>
+  <view>
+    <swipers :list="lb"></swipers>
+    <search text="超级秒杀！轮胎99元起"></search>
+    <view class="baoyang">
+      <indexSelect></indexSelect>
+      <view class="box">
+        <view @click="baoyang">
+          <indexIcon imgurl="../../static/img/fdj.png" desc="发动机养护" choosecolor="1"></indexIcon>
+        </view>
+        <view @click="baoyang">
+          <indexIcon imgurl="../../static/img/ranyou.png" desc="燃油系统养护" choosecolor="2"></indexIcon>
+        </view>
+        <view @click="baoyang">
+          <indexIcon imgurl="../../static/img/fdjyh.png" desc="发动机舱清洗" choosecolor="3"></indexIcon>
+        </view>
+        <view @click="baoyang">
+          <indexIcon imgurl="../../static/img/qys.png" desc="前雨刷" choosecolor="4"></indexIcon>
+        </view>
+      </view>
+      <view class="box">
+        <view @click="baoyang">
+          <indexIcon imgurl="../../static/img/kt.png" desc="空调系统养护" choosecolor="4"></indexIcon>
+        </view>
+        <view @click="baoyang">
+          <indexIcon imgurl="../../static/img/lq.png" desc="冷却系统养护" choosecolor="5"></indexIcon>
+        </view>
+        <view @click="baoyang">
+          <indexIcon imgurl="../../static/img/yq.png" desc="引擎系统养护" choosecolor="6"></indexIcon>
+        </view>
+        <view @click="baoyang">
+          <indexIcon imgurl="../../static/img/daolu.png" desc="道路救援 " choosecolor="7"></indexIcon>
+        </view>
+      </view>
+    </view>
+    <view class="tianjia" @click="addcar">
+      <indexAddcar></indexAddcar>
+    </view>
+    <view @click="ad1">
+      <indexAd :ad="ad"></indexAd>
+    </view>
+
+    <view class="miaosha">
+      <view class="title">
+        <indexSpike title="天天秒杀"></indexSpike>
+      </view>
+      <scroll-view :scroll-x="true">
+        <view class="body">
+          <view class="miaoshabox" v-for="(item,index) in ms" :key="index">
+            <indexMiaosha1
+              :huaxian="item.price_y"
+              :imgpic="item.imgpaththumb"
+              :msid="item.id"
+              :price="item.price"
+              :xiangou="item.ms_num"
+            ></indexMiaosha1>
+          </view>
+          <!-- <view class="miaoshabox">
+            <indexMiaosha1></indexMiaosha1>
+          </view>
+          <view class="miaoshabox">
+            <indexMiaosha1></indexMiaosha1>
+          </view>
+          <view class="miaoshabox">
+            <indexMiaosha1></indexMiaosha1>
+          </view>
+
+          <view class="miaoshabox">
+            <indexMiaosha1></indexMiaosha1>
+          </view>
+          <view class="miaoshabox">
+            <indexMiaosha1></indexMiaosha1>
+          </view>
+          <view class="miaoshabox">
+            <indexMiaosha1></indexMiaosha1>
+          </view>
+          <view class="miaoshabox">
+            <indexMiaosha1></indexMiaosha1>
+          </view>-->
+          <!-- <indexMiaosha class="box" choose="3" price="0.01"></indexMiaosha> -->
+        </view>
+      </scroll-view>
+    </view>
+    <view class="miaosha">
+      <view class="title">
+        <indexSpike title="拼团购"></indexSpike>
+      </view>
+      <view class="box">
+        <view @click="gotodetail" v-for="(item,index) in pintuan" :key="index" :data-id="item.id">
+          <indexShopdetail
+            :picurl="item.imgpaththumb"
+            :ifbk="item.isbk"
+            :shopname="item.goods_name"
+            :pri="item.price"
+            :sale="item.yp_num"
+            :ptid="item.id"
+          ></indexShopdetail>
+        </view>
+
+        <!-- <view @click="gotodetail">
+          <indexShopdetail
+            picurl="/static/img/shoppic.png"
+            ifbk="true"
+            shopname="轮胎/汽车轮胎 205/55R16 91V 韧悦 ENERGY XM2"
+            pri="520"
+            sale="200"
+          ></indexShopdetail>
+        </view>
+
+        <view @click="gotodetail">
+          <indexShopdetail
+            picurl="/static/img/shoppic.png"
+            ifbk="true"
+            shopname="轮胎/汽车轮胎 205/55R16 91V 韧悦 ENERGY XM2"
+            pri="520"
+            sale="200"
+          ></indexShopdetail>
+        </view>
+
+        <view @click="gotodetail">
+          <indexShopdetail
+            picurl="/static/img/shoppic.png"
+            ifbk="true"
+            shopname="轮胎/汽车轮胎 205/55R16 91V 韧悦 ENERGY XM2"
+            pri="520"
+            sale="200"
+          ></indexShopdetail>
+        </view>
+
+        <view @click="gotodetail">
+          <indexShopdetail
+            picurl="/static/img/shoppic.png"
+            ifbk="true"
+            shopname="轮胎/汽车轮胎 205/55R16 91V 韧悦 ENERGY XM2"
+            pri="520"
+            sale="200"
+          ></indexShopdetail>
+        </view>
+
+        <view @click="gotodetail">
+          <indexShopdetail
+            picurl="/static/img/shoppic.png"
+            ifbk="true"
+            shopname="轮胎/汽车轮胎 205/55R16 91V 韧悦 ENERGY XM2"
+            pri="520"
+            sale="200"
+          ></indexShopdetail>
+        </view>-->
+      </view>
+    </view>
+    <view class="tabbar">
+      <tabbar></tabbar>
+    </view>
+  </view>
 </template>
-
+<style lang="scss">
+.baoyang {
+  width: 720upx;
+  // height: 643upx;
+  border-radius: 14upx 14upx 0 0;
+  margin-left: 15upx;
+  position: relative;
+  top: -54upx;
+  background-color: #fff;
+  box-shadow: 0px 0px 18upx 2upx rgba(49, 49, 49, 0.13);
+  .box {
+    padding-top: 43upx;
+    padding-bottom: 33upx;
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: space-around;
+  }
+}
+.tianjia {
+  margin-left: 15upx;
+  margin-top: -15upx;
+}
+.miaosha {
+  width: 710upx;
+  // height: 643upx;
+  border-radius: 14upx 14upx 0 0;
+  margin-left: 20upx;
+  // position: relative;
+  // top: -54upx;
+  background-color: #fff;
+  box-shadow: 0px 0px 18upx 2upx rgba(49, 49, 49, 0.13);
+  margin-bottom: 31upx;
+  padding-bottom: 20upx;
+  .title {
+    padding-left: 16upx;
+    padding-top: 31upx;
+  }
+  .body {
+    padding: 27upx 16upx 43upx 16upx;
+    display: flex;
+    height: 195upx;
+    .box {
+      padding-right: 49upx;
+    }
+    .miaoshabox {
+      margin-right: 41upx;
+    }
+  }
+  .box {
+    width: 640upx;
+    // padding: 42upx 0 0 39upx;
+  }
+}
+.tabbar {
+  width: 100%;
+  background-color: white;
+  position: fixed;
+  bottom: 0;
+}
+</style> 
 <script>
-	export default {
-		data() {
-			return {
-				title: 'Hello'
-			}
-		},
-		onLoad() {
-
-		},
-		methods: {
-
-		}
-	}
-</script>
-
-<style>
-	.content {
-		text-align: center;
-		height: 400upx;
-	}
-
-	.logo {
-		height: 200upx;
-		width: 200upx;
-		margin-top: 200upx;
-	}
-
-	.title {
-		font-size: 36upx;
-		color: #8f8f94;
-	}
-</style>
+import search from "../../components/index/index-search";
+import swipers from "../../components/index/index-swiper";
+import indexShopdetail from "../../components/index/index-shopdetail";
+import indexMiaosha from "../../components/index/index-miaosha";
+import indexAd from "../../components/index/index-ad";
+import indexAddcar from "../../components/index/index-addcar";
+import indexIcon from "../../components/index/index-icon";
+import indexSelect from "../../components/index/index-select";
+import indexSpike from "../../components/index/index-spike";
+import tabbar from "../../components/tabbar/tabbar";
+import indexMiaosha1 from "../../components/index/index-miaosha1";
+import requestP from "../../static/js/request.js";
+export default {
+  data() {
+    return {
+      lb: [
+        "../../static/img/swiper.png",
+        "../../static/img/swiper.png",
+        "../../static/img/swiper.png"
+      ],
+      ad: "",
+      ms: [],
+      pintuan: []
+    };
+  },
+  components: {
+    search,
+    swipers,
+    indexShopdetail,
+    indexMiaosha,
+    indexAd,
+    indexAddcar,
+    indexIcon,
+    indexSelect,
+    indexSpike,
+    tabbar,
+    indexMiaosha1
+  },
+  onLoad() {
+    // requestP.requestP({
+    //   url:"baoyang/get_baoyang_list"
+    // }).then((res)=>{
+    //   console.log(res)
+    // })
+    requestP
+      .requestP({
+        url: "Index/index"
+      })
+      .then(res => {
+        console.log(res);
+        // console.log(res.data.data.lunbotu)
+        this.lb = res.data.data.lunbotu;
+        this.ad = res.data.data.guanggao.imgpath;
+        this.ms = res.data.data.miaosha_goods;
+        this.pintuan = res.data.data.pintuan_goods;
+        console.log(this.ad);
+        this.list = res.data.data;
+      });
+  },
+  methods: {
+    addcar() {
+      console.log(900);
+      uni.navigateTo({
+        url: "/pages/ceshi/ceshi"
+      });
+    },
+    gotodetail(e) {
+      console.log(e);
+      uni.navigateTo({
+        url:
+          "/pages/pintuanshopdetail/pintuanshopdetail?shopid=" +
+          e.currentTarget.dataset.id
+      });
+    },
+    ad1() {
+      uni.navigateTo({
+        url:
+          "/pages/shopdetail/shopdetail?shopid=" + this.list.guanggao.goods_id
+      });
+    },
+    baoyang(){
+           uni.navigateTo({
+                        url:"/pages/choosebaoyang/choosebaoyang"
+                    })
+    }
+  }
+};
+</script>
\ No newline at end of file
diff --git a/src/pages/login/login.vue b/src/pages/login/login.vue
new file mode 100644
index 0000000..4c23224
--- /dev/null
+++ b/src/pages/login/login.vue
@@ -0,0 +1,107 @@
+    <template>
+  <view class="login">
+    <view class="welcome">欢迎加入正恒车业！</view>
+    <view class="makesure">请确认授权以下信息</view>
+    <view class="get">获取你的公开信息（ 昵称、头像等 ）</view>
+    <button
+      class="btn"
+      type="primary"
+      open-type="getUserInfo"
+      lang="zh_CN"
+      @getuserinfo="onGotUserInfo"
+    >微信授权</button>
+  </view>
+</template>
+
+    <script>
+import requestP from "../../static/js/request.js";
+export default {
+  data() {
+    return {
+      code: ""
+    };
+  },
+  onLoad() {},
+
+  methods: {
+    onGotUserInfo() {
+      var t = this
+      wx.getSetting({
+        success: res => {
+          wx.login({
+            success: res => {
+              console.log(res);
+              t.code = res.code;
+              console.log(t.code);
+              wx.getUserInfo({
+                success: res => {
+                  console.log(res, 11);
+                  t.tx = res.userInfo.avatarUrl;
+                  t.nickname = res.userInfo.nickName;
+                  requestP
+                    .requestP({
+                      url: "user/login",
+                      data: {
+                        code: t.code,
+                        nickname: t.nickname,
+                        avatar_url: t.tx
+                      }
+                    })
+                    .then(res => {
+                      console.log(res);
+                      uni.setStorageSync("openid", res.data.openid);
+                      console.log(res.data.openid, 12222222);
+                      uni.redirectTo({
+                        url: "/pages/index/index"
+                      });
+                    });
+                }
+              });
+            }
+          });
+
+          console.log(res, 14);
+        }
+      });
+      console.log(101);
+      console.log(this.code, 7946);
+    }
+  }
+};
+</script>
+
+    <style lang="scss">
+.login {
+  width: 100vw;
+  .welcome {
+    color: #333333;
+    font-size: 28upx;
+    font-weight: bold;
+    margin-left: 100upx;
+    margin-top: 227upx;
+  }
+  .makesure {
+    color: #333333;
+    font-size: 20upx;
+    margin-top: 99upx;
+    margin-left: 99upx;
+  }
+  .get {
+    color: #999999;
+    font-size: 20upx;
+    margin-left: 99upx;
+    margin-top: 15upx;
+    margin-bottom: 58upx;
+  }
+  .btn {
+    width: 550upx;
+    height: 72upx;
+    background-color: #04cb00;
+    line-height: 72upx;
+    text-align: center;
+    color: white;
+    font-size: 28upx;
+    margin: 0 auto;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/pages/mine/mine.vue b/src/pages/mine/mine.vue
new file mode 100644
index 0000000..da51c8e
--- /dev/null
+++ b/src/pages/mine/mine.vue
@@ -0,0 +1,133 @@
+<template>
+  <view class="mine">
+    <mineTop ></mineTop>
+    <view class="menu">
+      <mineMenu @select="select"></mineMenu>
+    </view>
+    <view class="btns">
+      <view @click="goshopping">
+         <mineBtn title="购物车"></mineBtn>
+      </view>
+     <view @click="yhq1">
+         <mineBtn title="优惠券"></mineBtn>
+     </view>
+    
+      <view @click="tocheku">
+        <mineBtn title="爱车档案" ></mineBtn>
+      </view>
+      <view class="youhui" v-if="ifyh" >
+      <youhui
+        :ifyouhui="ifyh"
+        v-on:off="off"
+        :yhqall="yhq"
+        ifget="true"
+        @yhqpri="yhqpri"
+        @yhqid="yhqids"
+      ></youhui>
+    </view>
+      <!-- <mineBtn title="联系我们"></mineBtn> -->
+      <!-- <mineBtn title="关于我们"></mineBtn>
+      <mineBtn title="意见反馈"></mineBtn> -->
+    </view>
+    	<view class="tabbar">
+			<tabbar page=4></tabbar>
+		</view>
+  </view>
+  
+</template>
+
+<script>
+import mineTop from "../../components/mine/mine-top";
+import mineMenu from "../../components/mine/mine-menu";
+import mineBtn from "../../components/mine/mine-btn";
+  import tabbar from "../../components/tabbar/tabbar";
+  import youhui from "../../components/ordersub/ordersub-youhui";
+  import requestP from "../../static/js/request.js";
+export default {
+  components: {
+    mineTop,
+    mineMenu,
+    mineBtn,
+    tabbar,
+    youhui
+  },
+  data(){
+    return {
+       ifyh: false,
+      yhq:[]
+    }
+  },
+  onLoad(){
+    requestP.requestP({
+      url:"youhuiquan/get_list"
+    }).then((res)=>{
+      this.yhq=res.data.data
+      // this.ifyh=true
+    })
+  },
+  methods:{
+    select(e){
+      console.log(e)
+      uni.navigateTo({
+        url:"/pages/orderlist/orderlist?kind="+e
+      })
+    },
+    goshopping(){
+      uni.navigateTo({
+        url:"/pages/shopping/shopping"
+      })
+    },
+    tocheku(){
+       uni.navigateTo({
+        url:"/pages/mygarage/mygarage"
+      })
+    },
+    yhq1(){
+        if (this.yhq.length == 0) {
+        uni.showToast({
+          title: "您当前没有可以使用的优惠券",
+          icon: "none",
+          duration: 2000
+        });
+        this.yhale = "可以使用的优惠券";
+      } else {
+        this.ifyh = true;
+      }
+    },
+       off(e) {
+      this.ifyh = e;
+    },
+        yhqpri(e) {
+      console.log(e, "qweerew3w");
+      this.yhqprice = e;
+    },
+    yhqids(e) {
+      console.log(e, "yhqid111");
+      this.yhqid = e;
+    },
+  }
+};
+</script>
+
+<style lang="scss">
+.menu {
+  position: relative;
+  bottom: 220upx;
+  left: 19upx;
+}
+.btns {
+  position: relative;
+  bottom: 180upx;
+}
+.tabbar{
+	    width: 100%;
+    background-color: white;
+    position: fixed;
+    bottom: 0;
+}
+.youhui {
+  position: absolute;
+  top: -576upx;
+  z-index: 999;
+}
+</style>
\ No newline at end of file
diff --git a/src/pages/mygarage/mygarage.vue b/src/pages/mygarage/mygarage.vue
new file mode 100644
index 0000000..0d27bf1
--- /dev/null
+++ b/src/pages/mygarage/mygarage.vue
@@ -0,0 +1,121 @@
+<template>
+  <view class="cheku">
+    <view class="hezi">
+        <view class="garage" v-for="(i,j) in list" :key="j">
+      <mygarageList
+        :carid="i.car_id"
+        :isdefault="i.ismr"
+        :picurl="i.brandlogo"
+        :carname="i.car_name"
+        :cardesc="i.kuanxing "
+        @mr="mr"
+        @del="del"
+      ></mygarageList>
+    </view>
+    </view>
+  
+    <!-- <view class="garage">
+             <mygarageList isdefault=false picurl="../../static/img/garagecaricon.png" carname="江淮安驰-小公主" cardesc="2019款2.9T 手自一体 "></mygarageList>
+    </view>-->
+
+    <view class="anniu" @click="xzcx">
+      <mygarageBtn></mygarageBtn>
+    </view>
+  </view>
+</template>
+<script>
+import mygarageList from "../../components/mygarage/mygarage-list";
+import mygarageBtn from "../../components/mygarage/mygarage-btn";
+import requestP from "../../static/js/request.js";
+export default {
+  components: {
+    mygarageList,
+    mygarageBtn
+  },
+  data() {
+    return {
+      list: []
+    };
+  },
+  onLoad() {
+    requestP
+      .requestP({
+        url: "user_car/get_car_list"
+      })
+      .then(res => {
+        console.log(res);
+        this.list = res.data.data;
+      });
+  },
+  methods: {
+    xzcx() {
+      uni.navigateTo({
+        url: "/pages/ceshi/ceshi"
+      });
+    },
+    mr(e) {
+      requestP
+        .requestP({
+          url: "user_car/update_car_moren",
+          data: {
+            car_id: e
+          }
+        })
+        .then(res => {
+          console.log(res);
+          uni.showToast({
+            title: "设置成功",
+            icon: "none"
+          });
+          requestP
+            .requestP({
+              url: "user_car/get_car_list"
+            })
+            .then(res => {
+              console.log(res);
+              this.list = res.data.data;
+            });
+        });
+    },
+    del(e) {
+      requestP
+        .requestP({
+          url: "user_car/del_car",
+          data: {
+            car_id: e
+          }
+        })
+        .then(res => {
+          uni.showToast({
+            title: "删除成功",
+            icon: "none"
+          });
+          requestP
+            .requestP({
+              url: "user_car/get_car_list"
+            })
+            .then(res => {
+              console.log(res);
+              this.list = res.data.data;
+            });
+        });
+    }
+  }
+};
+</script>
+<style lang="scss">
+.hezi{
+ padding-bottom:100upx;
+}
+Page {
+  background-color: #f0eeef;
+}
+.garage {
+  padding-bottom: 19upx;
+}
+.anniu {
+  height: 107upx;
+  position: fixed;
+  bottom: 0;
+}
+</style>
\ No newline at end of file
diff --git a/src/pages/offer-list/offer-list.vue b/src/pages/offer-list/offer-list.vue
new file mode 100644
index 0000000..09a302a
--- /dev/null
+++ b/src/pages/offer-list/offer-list.vue
@@ -0,0 +1,14 @@
+<template>
+    <offerList picurl="../../static/img/offer-none.png" desc="亲，你还没有优惠券哦～"></offerList>
+</template>
+<script>
+import offerList from '../../components/offer/offer-list'
+export default {
+  components:{
+      offerList
+  }
+}
+</script>
+<style lang="scss" scoped>
+
+</style>
\ No newline at end of file
diff --git a/src/pages/order-detail/order-detail.vue b/src/pages/order-detail/order-detail.vue
new file mode 100644
index 0000000..c0f2ca6
--- /dev/null
+++ b/src/pages/order-detail/order-detail.vue
@@ -0,0 +1,100 @@
+<template>
+  <view class="orderDetail">
+    <view class="orderinfo">
+      <orderdetailInfo key1="订单编号" :val="list.order_no" class="info"></orderdetailInfo>
+      <orderdetailInfo key1="下单时间" :val="list.addtime" class="info"></orderdetailInfo>
+      <orderdetailInfo key1="支付方式" val="微信" class="info"></orderdetailInfo>
+    </view>
+
+    <view class="infos">
+      <view class="tittle">
+        <orderdetailTittle tittle0="收货信息"></orderdetailTittle>
+      </view>
+          
+      <orderdetailInfo key1="收货人" :val="list.ps_uname" class="info"></orderdetailInfo>
+      <orderdetailInfo key1="联系方式" :val="list.ps_phone" class="info"></orderdetailInfo>
+      <orderdetailInfo key1="收货地址" :val="list.ps_address" class="info"></orderdetailInfo>
+    </view>
+    <view class="shopinfo">
+      <view class="tittle">
+         <orderdetailTittle tittle0="商品信息"></orderdetailTittle>
+      </view>
+       
+     <orderdetailShopinfo :list="list.goods_list"></orderdetailShopinfo>
+    </view>
+    <view class="btn">
+      <view class="btn1">
+           <orderdetailBtn text="联系客服" ></orderdetailBtn>
+      </view>
+    </view>
+          <view class="tittle">
+         <orderdetailTittle tittle0="支付信息"></orderdetailTittle>
+      </view>
+      <orderdetailPay :all="list.price" :youhui="list.yhq_price" :yunfei="list.yf_price"></orderdetailPay>
+      <orderdetailZongjia :zong="list.goods_price"></orderdetailZongjia>
+  </view>
+</template>
+
+<script>
+import orderdetailInfos from "../../components/orderdetail/orderdetailinfos";
+import orderdetailInfo from "../../components/orderdetail/orderdetailinfo";
+import orderdetailTittle from "../../components/orderdetail/orderdetailtitt";
+import orderdetailShopinfo from "../../components/orderdetail/orderdetailshopinfo";
+import orderdetailBtn from "../../components/orderdetail/orderdetailbtn"
+import orderdetailPay from "../../components/orderdetail/orderdetailpay"
+import orderdetailZongjia from "../../components/orderdetail/orderdetail-zongjia"
+import {requestP} from "../../static/js/request"
+export default {
+  components: {
+    orderdetailInfos,
+    orderdetailInfo,
+    orderdetailTittle,
+    orderdetailShopinfo,
+    orderdetailBtn,
+    orderdetailPay,
+    orderdetailZongjia
+  },
+  data(){
+    return {
+      list: []
+    }
+  },
+  onLoad(a){
+      requestP({
+        url:"order/get_order_info",
+        data:{
+          order_id:a.id
+        }
+      }).then((res)=>{
+        console.log(res)
+        this.list = res.data.data
+      })
+  }
+};
+</script>
+
+<style lang="scss">
+.orderDetail {
+  .orderinfo{
+    background-color: white;
+  }
+  .infos {
+    background-color: white;
+  }
+  .btn{
+    width: 100%;
+    background-color: white;
+    margin-top: 2upx;
+    .btn1{
+      width: 710upx;
+     margin: 0 auto;
+    padding-top: 50upx;
+    padding-bottom: 20upx;    
+    }
+  }
+  .tittle{
+    margin-top: 14upx;
+    margin-bottom: 2upx;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/pages/order-sub/order-sub.vue b/src/pages/order-sub/order-sub.vue
new file mode 100644
index 0000000..ff588ec
--- /dev/null
+++ b/src/pages/order-sub/order-sub.vue
@@ -0,0 +1,290 @@
+<template>
+  <view>
+    <view @click="chooseaddr">
+      <ordersubUserinfo
+        :username="ordersubinfo.list_address[parseInt(this.canshu.addrkey)].uname?ordersubinfo.list_address[parseInt(this.canshu.addrkey)].uname:ordersubinfo.list_address[0].uname"
+        :address="ordersubinfo.list_address[parseInt(this.canshu.addrkey)].address?ordersubinfo.list_address[parseInt(this.canshu.addrkey)].address:ordersubinfo.list_address[0].address"
+        :tel="ordersubinfo.list_address[parseInt(this.canshu.addrkey)].phone?ordersubinfo.list_address[parseInt(this.canshu.addrkey)].phone:ordersubinfo.list_address[0].phone"
+        :addrnull="ordersubinfo.list_address.length==0"
+      ></ordersubUserinfo>
+      <!-- ordersubinfo.list_address.length==0 -->
+    </view>
+
+    <view class="shops" @click="servicelist">
+      <ordersubShop :shops="ordersubinfo.list_goods"></ordersubShop>
+    </view>
+    <view class="btn">
+      <ordersubBtn left="支付方式" right="在线支付" class="btn"></ordersubBtn>
+    </view>
+    <view @click="youhui">
+      <ordersubBtn left="优惠" :right="yhale"></ordersubBtn>
+    </view>
+    <view class="priarr">
+      <ordersubPricearr :zongjia="ordersubinfo.price_z" :yf="ordersubinfo.price_yf" :yhq="yhqprice"></ordersubPricearr>
+    </view>
+
+    <ordersubPay class="pay" :shifu="ordersubinfo.price_z-yhqprice" @pay="pay"></ordersubPay>
+    <ordersubNouser :ifnull="ifnull" v-on:charge="close"></ordersubNouser>
+    <view class="youhui" v-if="ifyh">
+      <youhui
+        :ifyouhui="ifyh"
+        v-on:off="off"
+        :yhqall="ordersubinfo.list_youhuijuan"
+        ifget="true"
+        @yhqpri="yhqpri"
+        @yhqid="yhqids"
+      ></youhui>
+    </view>
+  </view>
+</template>
+
+<script>
+import ordersubUserinfo from "../../components/ordersub/ordersub-userinfo";
+import ordersubShop from "../../components/ordersub/ordersub-shops";
+import ordersubBtn from "../../components/ordersub/ordersub-btn";
+import ordersubPricearr from "../../components/ordersub/ordersub-pricearr";
+import ordersubPay from "../../components/ordersub/ordersub-pay";
+import ordersubNouser from "../../components/ordersub/ordersub-nouser";
+import youhui from "../../components/ordersub/ordersub-youhui";
+import { requestP } from "../../static/js/request";
+export default {
+  components: {
+    ordersubUserinfo,
+    ordersubShop,
+    ordersubBtn,
+    ordersubPricearr,
+    ordersubPay,
+    ordersubNouser,
+    youhui
+  },
+  data() {
+    return {
+      ifnull: false,
+      ifyh: false,
+      ordersubinfo: {},
+      yhqprice: 0,
+      yhqid: "",
+      yhale: "",
+      guige: "",
+      canshu: {}
+    };
+  },
+  onLoad(e) {
+    console.log(e, "jiesuan0.0");
+    this.canshu = e;
+
+    this.ordersubinfo = uni.getStorageSync("ordersubinfo");
+    this.canshu.addrid = this.ordersubinfo.list_address[0].address_id;
+    console.log(this.ordersubinfo, "info");
+    if (this.ordersubinfo.list_address.length == 0) {
+    }
+    if (this.ordersubinfo.list_youhuijuan.length == 0) {
+        // uni.showToast({
+        //   title: "您当前没有可以使用的优惠券",
+        //   icon: "none",
+        //   duration: 2000
+        // });
+        this.yhale = "没有可以使用的优惠券";
+      }else{
+        this.yhale = "有可以使用的优惠券";
+
+      }
+  },
+  methods: {
+    servicelist() {
+      // uni.navigateTo({
+      //   url: "/pages/shopservice/shopservice"
+      // });
+    },
+    close(e) {
+      console.log(e, 11);
+      this.ifnull = e;
+    },
+    yhqpri(e) {
+      console.log(e, "qweerew3w");
+      this.yhqprice = e;
+        this.yhale = "-" + e ;
+
+    },
+    yhqids(e) {
+      console.log(e, "yhqid111");
+      this.yhqid = e;
+    },
+    youhui() {
+      if (this.ordersubinfo.list_youhuijuan.length == 0) {
+        uni.showToast({
+          title: "您当前没有可以使用的优惠券",
+          icon: "none",
+          duration: 2000
+        });
+        this.yhale = "没有可以使用的优惠券";
+      } else {
+        this.ifyh = true;
+      }
+      // this.ifyh=true
+    },
+    off(e) {
+      this.ifyh = e;
+    },
+    chooseaddr() {
+      console.log(this.canshu);
+      uni.navigateTo({
+        url:
+          "/pages/chooseaddr/chooseaddr?shopid=" +
+          this.canshu.shopid +
+          "&guige=" +
+          this.canshu.guige +
+          "&num=" +
+          this.canshu.num +
+          "&yhqid=" +
+          this.canshu.yhqid +
+          "&shoptype=" +
+          this.canshu.shoptype +
+          "&msid=" +
+          this.canshu.msid
+      });
+    },
+    pay(e) {
+      console.log(this.canshu);
+      if (this.canshu.shoptype == 0) {
+        // console.log(this.ordersubinfo.list_address[parseInt(this.canshu.addrkey)].address_id)
+        console.log(this.ordersubinfo.list_address[0].address_id,"lkopk")
+        requestP({
+          url: "pay/pay_goods_do",
+          data: {
+            goods_id: this.canshu.shopid,
+            goods_guige: this.canshu.guige,
+            num: this.canshu.num,
+            yhq_id: this.yhqid,
+            address_id:this.canshu.addrkey?this.ordersubinfo.list_address[parseInt(this.canshu.addrkey)].address_id:this.ordersubinfo.list_address[0].address_id
+          }
+        }).then(res => {
+          console.log(res);
+          if (res.data.code) {
+            uni.showToast({
+              title: "支付成功",
+              icon: "success",
+              duration: 2000
+            });
+          }
+        });
+        console.log("asd");
+      } else if (this.canshu.shoptype == 1) {
+        console.log("weq");
+        requestP({
+          url: "pay/pay_goods_do",
+          data: {
+            goods_ms_id: this.canshu.msid,
+            goods_guige: this.canshu.guige,
+            num: this.canshu.num,
+            yhq_id: this.yhqid,
+            address_id: this.canshu.addrid
+          }
+        }).then(res => {
+          console.log(res);
+          if (res.data.code) {
+            uni.showToast({
+              title: "支付成功",
+              icon: "success",
+              duration: 2000
+            });
+          }
+        });
+      } else if (this.canshu.shoptype == 3) {
+        console.log("weq");
+        requestP({
+          url: "pay/pay_cart_do",
+          data: {
+            cart_ids: uni.getStorageSync("cart_ids").join(','),
+            yhq_id: this.yhqid,
+            address_id: this.canshu.addrid
+          }
+        }).then(res => {
+          console.log(res);
+          if (res.data.code) {
+            uni.showToast({
+              title: "支付成功",
+              icon: "success",
+              duration: 2000
+            });
+          }
+        });
+      } else if (this.canshu.shoptype == 4) {
+        console.log("weq");
+        requestP({
+          url: "pay/pay_goods_pintuan_do",
+          data: {
+            goods_pt_id: this.canshu.ptid,
+            address_id: this.canshu.addrid,
+            num: 1,
+            goods_guige: this.canshu.guige
+          }
+        }).then(res => {
+          console.log(res);
+          if (res.data.code) {
+            uni.showToast({
+              title: "支付成功",
+              icon: "success",
+              duration: 2000
+            });
+
+            uni.navigateTo({
+              url: "/pages/pintuanorder/pintuanorder"
+            });
+          }
+        });
+      }else if(this.canshu.shoptype==5){
+         requestP({
+          url: "pay/pay_goods_pintuan_do",
+          data: {
+            goods_pt_id: this.canshu.ptid,
+            address_id: this.canshu.addrid,
+            num: 1,
+            goods_guige: this.canshu.guige,
+            pt_order_id:this.canshu.ptorderid
+          }
+        }).then(res => {
+          console.log(res);
+          if (res.data.code) {
+            uni.showToast({
+              title: "支付成功",
+              icon: "success",
+              duration: 2000
+            });
+
+            uni.navigateTo({
+              url: "/pages/pintuanorder/pintuanorder"
+            });
+          }
+        });
+      }
+    }
+  }
+};
+</script>
+
+<style lang="scss">
+Page {
+  background-color: #eeeeee;
+}
+.shops {
+  margin-top: 19upx;
+  margin-bottom: 19upx;
+}
+.btn {
+  margin-bottom: 2upx;
+}
+.priarr {
+  margin-top: 19upx;
+}
+.pay {
+  width: 100%;
+  position: fixed;
+  bottom: 0upx;
+}
+.youhui {
+  position: absolute;
+  top: 0;
+  z-index: 999;
+}
+</style>
\ No newline at end of file
diff --git a/src/pages/orderlist/orderlist.vue b/src/pages/orderlist/orderlist.vue
new file mode 100644
index 0000000..e7b550b
--- /dev/null
+++ b/src/pages/orderlist/orderlist.vue
@@ -0,0 +1,170 @@
+<template>
+  <view class="orderlist">
+    <view class="ordertab">
+      <orderTap tabtittle="全部,待付款,待收货,待评价" v-on:tabchange="change1" :tap="state"></orderTap>
+    </view>
+
+    <view class="orders" v-if="state==3">
+      <!-- <view class="orderitem" v-for="(i,j) in orderlist" :key="j"> -->
+        <orderItem
+          :orderno="i.order_no"
+          num="3"
+          money="146"
+          :state="i.state"
+          class="orderitem"
+          :shops="orderlist"
+        ></orderItem>
+      <!-- </view> -->
+      <!-- <view class="orderitem">
+        <orderItem
+          orderno="TH70900175"
+          shopname="养车定制T1汽车LED大灯 无损改装替换H7 6000K一对装 白光（不可用券）"
+          shoppic="../../static/img/ordershop.png"
+          num="3"
+          money="146"
+          class="orderitem"
+          state="4"
+        ></orderItem>
+      </view>
+      <view class="orderitem">
+        <orderItem
+          orderno="TH70900175"
+          shopname="养车定制T1汽车LED大灯 无损改装替换H7 6000K一对装 白光（不可用券）"
+          shoppic="../../static/img/ordershop.png"
+          num="3"
+          money="146"
+          state="2"
+          class="orderitem"
+        ></orderItem>
+      </view> -->
+    </view>
+    <view class="orders" v-if="state==0">
+      <!-- <view class="orderitem" v-for="(i,j) in orderlist0" :key="j"> -->
+        <orderItem
+          :orderno="i.order_no"
+          num="3"
+          money="146"
+          :state="i.state"
+          class="orderitem"
+          :shops="orderlist0"
+        ></orderItem>
+      <!-- </view> -->
+    </view>
+    <view class="orders" v-if="state==1">
+     <!-- <view class="orderitem" v-for="(i,j) in orderlist1" :key="j"> -->
+        <orderItem
+          :orderno="i.order_no"
+          num="3"
+          money="146"
+          :state="i.state"
+          class="orderitem"
+          :shops="orderlist1"
+        ></orderItem>
+      <!-- </view> -->
+  </view>
+  <view class="orders" v-if="state==2">
+      <!-- <view class="orderitem" v-for="(i,j) in orderlist2" :key="j"> -->
+        <orderItem
+          :orderno="i.order_no"
+          num="3"
+          money="146"
+          :state="i.state"
+          class="orderitem"
+          :shops="orderlist2"
+          @shouhuo="shouhuo"
+        ></orderItem>
+      <!-- </view> -->
+    </view>
+  </view>
+</template>
+
+<script>
+import orderTap from "../../components/order/order-tab";
+import offerList from "../../components/offer/offer-list";
+import orderItem from "../../components/order/orderitem";
+import requestP from "../../static/js/request.js";
+export default {
+  data() {
+    return {
+      ifnull: true,
+      state: 3,
+      orderlist:[],
+      orderlist0:[],
+      orderlist1:[],
+      orderlist2:[],
+
+    };
+  },
+  onLoad(e){
+    this.state=e.kind
+    console.log(this.state)
+    requestP.requestP({
+      url:"order/get_order_list",
+    }).then((res)=>{
+      console.log(res.data.data)
+      this.orderlist=res.data.data  
+    })
+     requestP.requestP({
+      url:"order/get_order_list",
+      data:{
+        type:0
+      }
+    }).then((res)=>{
+      console.log(res.data.data)
+      this.orderlist0=res.data.data  
+    })
+    requestP.requestP({
+      url:"order/get_order_list",
+      data:{
+        type:1
+      }
+    }).then((res)=>{
+      console.log(res.data.data)
+      this.orderlist1=res.data.data  
+    })
+    requestP.requestP({
+      url:"order/get_order_list",
+      data:{
+        type:2
+      }
+    }).then((res)=>{
+      console.log(res.data.data)
+      this.orderlist2=res.data.data  
+    })
+  },
+  components: {
+    orderTap,
+    offerList,
+    orderItem
+  },
+  methods: {
+    change1(data) {
+      console.log(data, 42);
+      this.state = data;
+    },
+    shouhuo(e){
+      console.log(e)
+    }
+  }
+};
+</script>
+
+<style lang="scss">
+page {
+  background-color: #eeeeee;
+}
+.orderlist {
+  .ordertab {
+    background-color: white;
+    position: relative;
+    z-index: 999;
+  }
+  .ordernull {
+    position: absolute;
+    top: 0;
+  }
+  .orderitem {
+    margin-top: 21upx;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/pages/pintuanorder/pintuanorder.vue b/src/pages/pintuanorder/pintuanorder.vue
new file mode 100644
index 0000000..d311b53
--- /dev/null
+++ b/src/pages/pintuanorder/pintuanorder.vue
@@ -0,0 +1,143 @@
+<template>
+  <view class="pintuanorder">
+    <view class="ordertop">
+      <orderTab tabtittle="全部,待成团,已成团,拼团失败" v-on:tabchange="change1"></orderTab>
+    </view>
+
+    <view class="orders" v-if="state==3">
+        <view class="orderitem" v-for="(i,j) in orderlist" :key="j">
+          <pintuanorderitem
+            :shoppic="i.imgpaththumb"
+            :shopname="i.goods_name"
+            :num="i.rs_num"
+            :money="i.price"
+            :state="i.state"
+             :sid="i.pintuan_order_id"
+            :is_tuikuan="i.is_tuikuan"
+    :shopid="i.goods_id"
+
+          ></pintuanorderitem>
+        </view>
+    </view>
+    <view class="orders" v-if="state==0">
+         <view class="orderitem" v-for="(i,j) in orderlist" :key="j">
+          <pintuanorderitem
+            :shoppic="i.imgpaththumb"
+            :shopname="i.goods_name"
+            :num="i.rs_num"
+            :money="i.price"
+              :state="i.state"
+             :sid="i.goods_pt_id"
+            :is_tuikuan="i.is_tuikuan"
+    :shopid="i.goods_id"
+          ></pintuanorderitem>
+        </view>
+    </view>
+    <view class="orders" v-if="state==1">
+         <view class="orderitem" v-for="(i,j) in orderlist" :key="j">
+          <pintuanorderitem
+            :shoppic="i.imgpaththumb"
+            :shopname="i.goods_name"
+            :num="i.rs_num"
+            :money="i.price"
+             :state="i.state"
+             :sid="i.goods_pt_id"
+            :is_tuikuan="i.is_tuikuan"
+
+    :shopid="i.goods_id"
+          ></pintuanorderitem>
+        </view>
+    </view>
+    <view class="orders" v-if="state==2">
+      <view class="orderitem">
+        <view class="ordernull" v-if="ifnull">
+          <!-- <offerList picurl="../../static/img/offer-none.png" desc="亲，你还没有订单哦～"></offerList> -->
+        </view>
+           <view class="orderitem" v-for="(i,j) in orderlist" :key="j">
+          <pintuanorderitem
+            :shoppic="i.imgpaththumb"
+            :shopname="i.goods_name"
+            :num="i.rs_num"
+            :money="i.price"
+              :state="i.state"
+             :sid="i.goods_pt_id"
+    :shopid="i.goods_id"
+            :is_tuikuan="i.is_tuikuan"
+
+          ></pintuanorderitem>
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+import orderTab from "../../components/order/order-tab";
+import orderItem from "../../components/order/orderitem";
+import pintuanorderitem from "../../components/order/pintuanorderitem";
+import { requestP } from "../../static/js/request";
+export default {
+  components: {
+    orderTab,
+    orderItem,
+    pintuanorderitem
+  },
+  data() {
+    return {
+      state: 3,
+      orderlist:[]
+    };
+  },
+  methods: {
+    change1(data) {
+      console.log(data, 42);
+      this.state = data;
+      if(data==3){
+            requestP({
+        url: "pintuan/get_list_my_pintuan",
+        data: {
+          
+        }
+      }).then((res)=>{
+        console.log(res)
+        this.orderlist=res.data.data
+      })
+      }else{
+        requestP({
+        url: "pintuan/get_list_my_pintuan",
+        data: {
+          type:data
+        }
+      }).then((res)=>{
+        console.log(res)
+        this.orderlist=res.data.data
+
+      })
+      }
+      
+    }
+  },
+  onLoad() {
+         requestP({
+        url: "pintuan/get_list_my_pintuan",
+        data: {
+    
+        }
+      }).then((res)=>{
+        console.log(res)
+        this.orderlist=res.data.data
+      })
+  }
+};
+</script>
+
+<style lang="scss">
+Page {
+  background-color: #f0f2f5;
+}
+.pintuanorder {
+  .orderitem {
+    margin-top: 21upx;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/pages/pintuanshop/pintuanshop.vue b/src/pages/pintuanshop/pintuanshop.vue
new file mode 100644
index 0000000..8634018
--- /dev/null
+++ b/src/pages/pintuanshop/pintuanshop.vue
@@ -0,0 +1,111 @@
+<template>
+  <view class="pintuanshop">
+    <pintuanshopNav v-on:selected="navitem" :navlist="navlist"></pintuanshopNav>
+    <pintuanshopLine></pintuanshopLine>
+    <view class="shoplist" v-for="(item,index) in shoplist" :key="index" v-show="cupage == index">
+     <!-- {{cupage == index ? true : false}} -->
+       <view class="shoplistitem" v-for="(i,j) in item.goods_list" :key="j">
+        <pintuanshops
+          :shoppic="i.imgpaththumb"
+          :shopname="i.goods_name"
+          :pri="i.price"
+          :huaxian="i.price_y"
+          :yipin="i.yp_num"
+          :shopid="i.goods_pt_id"
+        ></pintuanshops>
+     </view>
+      
+      <!-- <view class="shoplistitem">
+        <pintuanshops></pintuanshops>
+      </view>
+      <view class="shoplistitem">
+        <pintuanshops></pintuanshops>
+      </view>
+      <view class="shoplistitem">
+        <pintuanshops></pintuanshops>
+      </view>
+      <view class="shoplistitem">
+        <pintuanshops></pintuanshops>
+      </view>
+      <view class="shoplistitem">
+        <pintuanshops></pintuanshops>
+      </view>
+      <view class="shoplistitem">
+        <pintuanshops></pintuanshops>
+      </view>-->
+    </view>
+
+    <!-- <view class="shoplist" v-if="cupage==2">
+      <view class="shoplistitem">
+        <pintuanshops></pintuanshops>
+      </view>
+    </view>
+
+    <view class="shoplist" v-if="cupage==3">
+      <view class="shoplistitem">
+        <pintuanshops></pintuanshops>
+      </view>
+      <view class="shoplistitem">
+        <pintuanshops></pintuanshops>
+      </view>
+    </view>-->
+  </view>
+</template>
+
+<script>
+import pintuanshopNav from "../../components/pintuanshop/pintuanshop-nav";
+import pintuanshopLine from "../../components/pintuanshop/pintuanshop-line";
+import pintuanshops from "../../components/pintuanshop/pintuanshops";
+import requestP from "../../static/js/request.js";
+export default {
+  data() {
+    return {
+      cupage: 0,
+      navlist: [],
+      shoplist: []
+    };
+  },
+  components: {
+    pintuanshopNav,
+    pintuanshopLine,
+    pintuanshops
+  },
+  onLoad() {
+    requestP
+      .requestP({
+        url: "Pintuan/get_list_pintuan"
+      })
+      .then(res => {
+        console.log(res);
+        for (let i in res.data.data) {
+          this.navlist.push(res.data.data[i].cat_name);
+        }
+        this.shoplist = res.data.data;
+        console.log(this.navlist);
+      });
+  },
+  methods: {
+    navitem(e) {
+      console.log(e, "aaa");
+      this.cupage = e;
+    }
+  }
+};
+</script>
+
+<style lang="scss">
+Page {
+  background-color: #eeeeee;
+}
+.pintuanshop {
+  .shoplist {
+    // display: flex;
+    flex-wrap: wrap;
+    .shoplistitem {
+      float: left;
+      margin-right: 7upx;
+      margin-bottom: 11upx;
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/pages/pintuanshopdetail/pintuanshopdetail.vue b/src/pages/pintuanshopdetail/pintuanshopdetail.vue
new file mode 100644
index 0000000..95cdfc3
--- /dev/null
+++ b/src/pages/pintuanshopdetail/pintuanshopdetail.vue
@@ -0,0 +1,149 @@
+<template>
+  <view class="pintuanshopdetail">
+    <!-- "../../static/img/shoplb.png,../../static/img/caricon.png,../../static/img/caricon1.png" -->
+    <pintuanshoptop
+      :picarr="shopinfo.imgs"
+      :money="shopinfo.price"
+      :huaxian="shopinfo.price_h"
+      :yituan="shopinfo.yp_num"
+      :tuantotal="shopinfo.kp_num"
+      :shopname="shopinfo.goods_name"
+      ensurepic="../../static/img/pintuanensure.png"
+      ensures="全正品,价格低,放心购,快送达"
+    ></pintuanshoptop>
+    <pintuanline1></pintuanline1>
+    <pintuanshopdetailale ale="所有用户都能够开团，但是只有没有在养车购买过商品的用户才能参团哦，快邀请新朋友来参加吧~"></pintuanshopdetailale>
+    <pintuanline1></pintuanline1>
+    <view class="top">
+      <pintuanlisttop :title1="shopinfo.rs_num+'人在开团'"></pintuanlisttop>
+    </view>
+    <pintuanshopdetaillist :pintuanlist="pintuanlist" @cantuan="cantuan" @getorderid="getorderid"></pintuanshopdetaillist>
+    <pintuanline1></pintuanline1>
+    <pintuanrule></pintuanrule>
+    <view class="line1">
+      <pintuanline1></pintuanline1>
+    </view>
+    <pintuanshopdetailbottom :dan="shopinfo.price_y" :pin="shopinfo.price" class="bottom" @dandu="buy" @group="group"></pintuanshopdetailbottom>
+     <view class="choosesize">
+      <shopdetailchoosesize
+         :ifchoose="ifchoose"
+        @close="guanbi"
+        :shoppic="shopinfo.imgs[0].img_path"
+        :price="shoptype != 0?shopinfo.price:shopinfo.price_y"
+        :huaxian="shopinfo.price_y"
+        :tags="guige"
+        @tagchange="tagchange"
+        :shoptype="shoptype"
+        :ptid="shopinfo.goods_pt_id"
+        :kucun="shopinfo.kp_num"
+        :ptorderid="ptorderid"
+        :shopid="shopinfo.goods_id"
+      ></shopdetailchoosesize>
+    </view>
+  </view>
+</template>
+
+<script>
+import pintuanshoptop from "../../components/pintuanshopdetail/pintuanshopdetail-top";
+import pintuanshopdetailale from "../../components/pintuanshopdetail/pintuandetail-ale";
+import pintuanshopdetaillist from "../../components/pintuanshopdetail/pintuandetail-list";
+import pintuanlisttop from "../../components/pintuanshopdetail/pintuanlisttop";
+import pintuanrule from "../../components/pintuanshopdetail/pintuanrule";
+import pintuanline1 from "../../components/pintuanshopdetail/pintuanline1";
+import pintuanshopdetailbottom from "../../components/pintuanshopdetail/pintuandetail-bottom";
+import shopdetailchoosesize from "../../components/shopdetail/shopdetail-choosesize";
+import requestP from "../../static/js/request.js";
+export default {
+  components: {
+    pintuanshoptop,
+    pintuanshopdetailale,
+    pintuanshopdetaillist,
+    pintuanlisttop,
+    pintuanrule,
+    pintuanline1,
+    pintuanshopdetailbottom,
+    shopdetailchoosesize
+  },
+  data(){
+    return{
+      pintuanlist:[
+      //   {touxiang:"../../static/img/pintuanuser.png",username:"Awen",cha:3,hour:5,minute:12,second:40},
+      // {touxiang:"../../static/img/pintuanuser.png",username:"Awen",cha:3,hour:5,minute:12,second:40}
+      ],
+      shopinfo:"",
+      lbt:"",
+      ifchoose:false,
+      shoptype:2,
+      ptorderid:""
+    }
+  },
+  onLoad(e){
+     requestP
+      .requestP({
+        url: "pintuan/get_goods_info",
+        data:{
+          goods_pt_id:e.shopid
+        }
+      })
+      .then((res) => {
+        var lbt=[]
+        console.log(res);
+        this.shopinfo=res.data.data;
+        for(let i in res.data.data.imgs){
+          lbt.push(res.data.data.imgs[i].img_path)
+          // this.lbt=this.lbt+res.data.data.imgs[i].img_path+','
+        }
+        this.lbt=lbt
+        console.log(this.lbt,122)
+        this.pintuanlist=res.data.data.pt_order
+        console.log(this.pintuanlist,6666669)
+        // this.shijian(res.data.data)
+        this.renshuall=res.data.data.rs_num
+        console.log(res.data.data.rs_num,71111)
+      });
+    console.log(e)
+  },
+  methods:{
+    buy(e){
+      this.shoptype=0
+
+      // console.log(e,46464)
+       this.ifchoose = e;
+    },
+    group(e){
+      this.shoptype=2
+      console.log(this.ifchoose,"lolkkll")
+        this.ifchoose = e;
+    },
+     guanbi(e) {
+      this.ifchoose = e;
+    },
+    cantuan(e){
+        this.shoptype=4
+      this.ifchoose=e;
+    },
+    getorderid(e){
+      console.log(e,"aweds")
+      this.ptorderid=e
+    }
+  }
+};
+</script>
+
+<style lang="scss">
+.pintuanshopdetail{
+  padding-bottom: 120upx;
+}
+.line {
+  margin-top: 15upx;
+}
+.top {
+  margin-bottom: 45upx;
+  border-bottom: 1upx solid #eeeeee;
+}
+.bottom{
+  position: fixed;
+  bottom: 0;
+  left: 0;
+}
+</style>  
\ No newline at end of file
diff --git a/src/pages/proyear/proyear.vue b/src/pages/proyear/proyear.vue
new file mode 100644
index 0000000..fd0d88f
--- /dev/null
+++ b/src/pages/proyear/proyear.vue
@@ -0,0 +1,75 @@
+<template>
+<view>
+ <proyearCarinfo :carname="canshu.popname" :carpic="canshu.popimg"></proyearCarinfo>
+<proyearChoose :desc="canshu.pailiang" ifarrow=true></proyearChoose>
+<proyearChoosetitle desc="选择生产年份"></proyearChoosetitle>
+<view v-for="(i,j) in list" :key="j" @click="tochexing(i.nianfen,i.nianfen_id)">
+<proyearChoose ifline=true :desc="i.nianfen"></proyearChoose>
+
+</view>
+<!-- <proyearChoose ifline=true desc="1999年生产"></proyearChoose>
+<proyearChoose ifline=true desc="1999年生产"></proyearChoose>
+<proyearChoose ifline=true desc="1999年生产"></proyearChoose>
+<proyearChoose ifline=true desc="1999年生产"></proyearChoose>
+<proyearChoose ifline=true desc="1999年生产"></proyearChoose> -->
+</view>
+
+</template>
+<script>
+import proyearCarinfo from "../../components/proyear/proyear-carinfo";
+import proyearChoose from "../../components/proyear/proyear-choose";
+import proyearChoosetitle from '../../components/proyear/proyear-choosetitle'
+import {requestP} from "../../static/js/request"
+export default {
+  components: {
+    proyearCarinfo,
+    proyearChoose,
+    proyearChoosetitle
+  },
+  data(){
+    return {
+      list:[],
+        carname:[],
+      carpic:[],
+      canshu:{}
+    }
+  },
+  methods:{
+    tochexing(e,f){
+       uni.navigateTo({
+        url:
+          "/pages/choosechexing/choosechexing?year=" +
+          e +
+          "&popname=" +
+          this.canshu.popname +
+          "&popimg=" +
+          this.canshu.popimg +
+          "&pinpaiid=" +
+          this.canshu.pinpaiid +
+          "&chexingid=" +
+          this.canshu.chexingid +
+          "&chexiid=" +
+          this.canshu.chexiid+"&yearid="+f+"&pailiangid="+this.canshu.pailiangid
+      });
+    }
+  },
+  onLoad(e){
+    console.log(e,'uear')
+    this.canshu=e
+    requestP({
+      url:"car/get_nian_list",
+      data:{
+        brand_id:e.pinpaiid,
+        chexi_id:e.chexiid,
+        chexing_id:e.chexingid,
+        pailiang_id:e.pailiangid
+      }
+    }).then((res)=>{
+      console.log(res)
+      this.list = res.data.data
+    })
+  }
+};
+</script>
+<style lang="scss" scoped>
+</style>
\ No newline at end of file
diff --git a/src/pages/search/search.vue b/src/pages/search/search.vue
new file mode 100644
index 0000000..2e5b357
--- /dev/null
+++ b/src/pages/search/search.vue
@@ -0,0 +1,104 @@
+<template>
+  <view class="search">
+    <searchShuru isdel=true @sousuo="sousuo"></searchShuru>
+    <searchTab tabtittle="综合,销量,价格" @shaixuan="shaixuan"></searchTab>
+    <!-- <searchChexing chexing="车型：江淮安驰=小公主 2001款 0.8L 手动 国"></searchChexing> -->
+    <view v-for="(i,j) in shoplist" :key="j" @click="todetail" :data-id="i.goods_id">
+       <searchShop  :shopname="i.goods_name" :tag="i.ms" :pic="i.imgpaththumb" :pri="i.price" :zhushi="i.pingjia_num+'条评价'+i.pingjia_bfb+'%好评'"
+    ></searchShop>
+    </view>
+   
+  </view>
+</template>
+       
+<script>
+import searchShuru from "../../components/search/searchShuru";
+import searchTab from "../../components/search/searchTap";
+import searchChexing from "../../components/search/searchChexing";
+import searchShop from "../../components/search/searchShop";
+import requestP from "../../static/js/request.js";
+export default {
+  components: {
+    searchShuru,
+    searchTab,
+    searchChexing,
+    searchShop
+  },
+  data(){
+    return {
+      shoplist:[],
+      px:0,
+      so:"",
+      type:0
+    }
+  },
+  onLoad(e){
+    console.log(e)
+    this.so = e
+    this.type =0
+    if(e != ""){
+      requestP
+      .requestP({
+        url: "goods/search_goods_list",
+        data:{
+          cat_id:e.typeid
+        }
+      }).then((res)=>{
+        this.shoplist=res.data.data
+      })
+    }
+     
+  },
+  methods:{
+    todetail(e){
+      console.log(e.currentTarget.dataset.id)
+      	uni.navigateTo({
+					url:"/pages/shopdetail/shopdetail?shopid="+e.currentTarget.dataset.id
+				})
+    },
+    pin(e){
+ console.log(e)
+    this.so = e
+    this.type =0
+    if(e != ""){
+      requestP
+      .requestP({
+        url: "goods/search_goods_list",
+        data:{
+          px:this.px,
+          cat_id:e.typeid
+        }
+      }).then((res)=>{
+        this.shoplist=res.data.data
+      })
+    }
+    },
+    sousuo(a){
+      this.so = a 
+      this.type = 1
+requestP
+      .requestP({
+        url: "goods/search_goods_list",
+        data:{
+          select_info:a,
+          px:this.px
+        }
+      }).then((res)=>{
+        this.shoplist=res.data.data
+      })
+    },
+    shaixuan(a){
+      this.px =a
+      // sousuo()
+      if(this.type == 0){
+        this.pin(this.so)
+      }else{ 
+        this.todetail(this.so)
+      }
+    }
+  }
+};
+</script>
+
+<style lang="scss">
+</style>
diff --git a/src/pages/seckill/seckill.vue b/src/pages/seckill/seckill.vue
new file mode 100644
index 0000000..67f6da5
--- /dev/null
+++ b/src/pages/seckill/seckill.vue
@@ -0,0 +1,211 @@
+<template>
+  <view class="seckill">
+    <view class="top">
+      <seckillTop :list="list" :cutime="cupage"></seckillTop>
+    </view>
+
+    <swiper
+      class="swiper"
+      :indicator-dots="indicatorDots"
+      :autoplay="autoplay"
+      :interval="interval"
+      :duration="duration"
+      @change="aa"
+    >
+      <swiper-item class="item" v-for="(i,j) in list" :key="j">
+        <view class="ads">
+          <view class="ad" @click="toaddetail">
+            <seckillAd :picurl="ad1"></seckillAd>
+          </view>
+          <view class="ad" @click="toaddetail1">
+            <seckillAd :picurl="ad2"></seckillAd>
+          </view>
+        </view>
+        <view class="tittle">
+          <seckillTittle :show="j" :date="i.jieshushijian"></seckillTittle>
+        </view>
+        <view class="shop" v-for="(i,k) in i.goods_list" :key="k" @click="todetail" :data-id="i.goods_ms_id">
+          <seckillShop
+            :imgurl="i.imgpaththumb"
+            :shopname="i.goods_name"
+            :shopdesc="goods_ms"
+            tag=""
+            :price="i.price"
+            :huaxian="i.price_y"
+            :sale="i.yp_kp_bfb"
+            :show="j"
+          ></seckillShop>
+        </view>
+      </swiper-item>
+
+      <!-- <swiper-item class="item">
+        <view class="ads">
+          <view class="ad">
+            <seckillAd picurl="../../static/img/seckillad1.png"></seckillAd>
+          </view>
+          <view class="ad">
+            <seckillAd picurl="../../static/img/seckillad2.png"></seckillAd>
+          </view>
+        </view>
+        <view class="tittle">
+          <seckillTittle></seckillTittle>
+        </view>
+        <view class="shop">
+          <seckillShop
+            imgurl="../../static/img/seckillshop.png"
+            shopname="【小米生态链】70迈智能胎压检测仪···"
+            shopdesc="小米生态链新成员 太阳能无线 胎压胎温同显"
+            tag="包安装"
+            price="465.23"
+            huaxian="652.45"
+            sale="40%"
+          ></seckillShop>
+          <seckillShop
+            imgurl="../../static/img/seckillshop.png"
+            shopname="【小米生态链】70迈智能胎压检测仪···"
+            shopdesc="小米生态链新成员 太阳能无线 胎压胎温同显"
+            tag="包安装"
+            price="465.23"
+            huaxian="652.45"
+            sale="40%"
+          ></seckillShop>
+        </view>
+      </swiper-item>-->
+    </swiper>
+  </view>
+</template>
+
+<script>
+import seckillceshi from "../../components/seckill/seckillceshi";
+import seckillTop from "../../components/seckill/seckillTop";
+import seckillAd from "../../components/seckill/seckillad";
+import seckillTittle from "../../components/seckill/seckilltittle";
+import seckillShop from "../../components/seckill/seckillshop";
+import {requestP} from "../../static/js/request"
+export default {
+  data() {
+    return {
+      cupage: 0,
+      list:[],
+      ad1:"",
+      ad2:"",
+      adid:0,
+      adid1:0
+    };
+  },
+  components: {
+    seckillceshi,
+    seckillTop,
+    seckillAd,
+    seckillTittle,
+    seckillShop
+  },
+  methods: {
+    toaddetail(e){
+      console.log(this.adid)
+      uni.navigateTo({
+        url:"/pages/seckilldetail/seckilldetail?msid="+this.adid
+      })
+    },
+      toaddetail1(e){
+      console.log(this.adid1)
+      uni.navigateTo({
+        url:"/pages/seckilldetail/seckilldetail?msid="+this.adid
+      })
+    },
+    aa(e) {
+      console.log(e);
+      this.cupage = e.detail.current;
+    },
+    todetail(e){
+      console.log(e.currentTarget.dataset.id)
+      uni.navigateTo({
+        url:"/pages/seckilldetail/seckilldetail?msid="+e.currentTarget.dataset.id
+      })
+    },
+    shijian(completeTime) {
+      console.log(completeTime)
+          var stime = Date.parse(new Date());
+          var etime = Date.parse(new Date(completeTime));
+          console.log(stime,etime)
+          // 两个时间戳相差的毫秒数
+          var usedTime = etime - stime;
+          // 计算相差的天数  
+          // var days = Math.floor(usedTime / (24 * 3600 * 1000));
+          // 计算天数后剩余的毫秒数
+          var leave1 = usedTime % (24 * 3600 * 1000);  
+          // 计算出小时数  
+          var hours = Math.floor(usedTime / (3600 * 1000));
+          // 计算小时数后剩余的毫秒数
+          var leave2 = leave1 % (3600 * 1000);        
+          // 计算相差分钟数
+          var minutes = Math.floor(leave2 / (60 * 1000));
+          var leave3 = leave2 % (60 * 1000)
+           var s = Math.floor(leave3 / (1000));
+          var time = [hours,minutes,s];
+          console.log(time)
+          return time;
+    }
+  },
+  onLoad(){
+    requestP({
+      url:"Miaosha/get_list_miaosha"
+    }).then((res)=>{
+      // for(let i in res.data.data){
+        res.data.data[0].jieshushijian = this.shijian(res.data.data[0].ms_endtime)
+      // }
+      console.log(res.data.data)
+      this.list = res.data.data
+      this.adlist=res.data
+      this.ad1=res.data.guanggao_img1[0].imgpath
+      this.ad2=res.data.guanggao_img2[0].imgpath
+      this.adid=res.data.guanggao_img1[0].ms_goods_id
+      this.adid1=res.data.guanggao_img2[0].ms_goods_id
+      console.log(res.data.guanggao_img1[0].ms_goods_id,"loijhnkolsdhvb")
+    })
+  }
+};
+</script>
+
+<style lang="scss">
+.seckill {
+  width: 750upx;
+  .top {
+    width: 100%;
+    position: absolute;
+    z-index: -1;
+  }
+  .ads {
+    display: flex;
+    justify-content: center;
+    position: absolute;
+    top: 15upx;
+    left: 23upx;
+    z-index: 999;
+    .ad {
+      margin-right: 14upx;
+      height: 165upx;
+    }
+  }
+  .tittle {
+    position: relative;
+    bottom: -218upx;
+    left: 25upx;
+  }
+
+  .swiper {
+    position: relative;
+    top: 155upx;
+    height: 100vh;
+    .item {
+      position: absolute;
+      z-index: 999;
+      .shop {
+        position: relative;
+        z-index: 999;
+        top: 223upx;
+      }
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/pages/seckilldetail/seckilldetail.vue b/src/pages/seckilldetail/seckilldetail.vue
new file mode 100644
index 0000000..af7e105
--- /dev/null
+++ b/src/pages/seckilldetail/seckilldetail.vue
@@ -0,0 +1,274 @@
+<template>
+  <view class="shopdetail">
+    <shopdetailToppic :picarr="list.imgs" v-on:btnchange="change0"></shopdetailToppic>
+    <view class="btn">
+      <shopdetailBtn :ifsp="ifsp" btn1="视频"></shopdetailBtn>
+      <shopdetailBtn btn1="图片" :ifsp="!ifsp"></shopdetailBtn>
+    </view>
+    <!-- <view class="pri">
+       <shopdetailPri pri="45" ></shopdetailPri>
+    </view>-->
+    <view class="detail">
+      <view class="seckilldetail">
+        <seckillshopdetailname
+          :price="list.price"
+          :price_y="list.price_y"
+          :yp_kp_bfb="list.yp_kp_bfb"
+          :times="list.endtime"
+        ></seckillshopdetailname>
+      </view>
+      <shopdetailShopinfo :shopname="list.goods_name" :shopdesc="list.goods_ms"></shopdetailShopinfo>
+    </view>
+    <view class="servicelist" v-if="ifservice">
+      <shopdetailServicelist ifservice="ifservice" v-on:turnoff="off"></shopdetailServicelist>
+    </view>
+
+    <shopdetailLine></shopdetailLine>
+    <shopdetailEnsure
+      ensurepic="../../static/img/ensure.png"
+      ensures="全正品,价格低,放心购,快送达"
+      v-on:more="more"
+    ></shopdetailEnsure>
+    <shopdetailLine></shopdetailLine>
+
+    <shopdetailCommentstop left="商品评论" right="好评率99.2%" ifarrow="true"></shopdetailCommentstop>
+    <!-- <view class="pinglun">
+      <shopdetailPinglun content="产品好 正品 43,下次还来 13,价格低 5,性价比高 4,服务好 3,性价比高 4"></shopdetailPinglun>
+    </view>-->
+    <view v-for="(item,j) in list.pingjia" :key="j">
+      <assessList
+        :pingfen="item.xing"
+        :username="item.uname"
+        :userpic="item.avatar_url"
+        proname
+        :date="item.pingjia_time"
+        :detail="item.comment"
+        :buydate="item.pay_time"
+        shoppic="../../static/img/shoppic1.png"
+        :stars="item.xing"
+        :pinglunpic="item.imgs"
+      ></assessList>
+    </view>
+
+    <!-- <assessList
+      pingfen="5.01"
+      username="M***A"
+      proname="大众 途观"
+      date="2019.08.22"
+      detail="维修师傅态度很好，问的问题多余给你解释很棒，维修师傅态度很好，问的问题多余给你解释很棒，下次保养还回来！维修师傅态度很好，问的问题多余···"
+      shop="养车工厂店"
+      shoppic="../../static/img/shoppic1.png"
+      stars="4"
+    ></assessList>
+    <assessList
+      pingfen="5.01"
+      username="M***A"
+      proname="大众 途观"
+      date="2019.08.22"
+      detail="维修师傅态度很好，问的问题多余给你解释很棒，维修师傅态度很好，问的问题多余给你解释很棒，下次保养还回来！维修师傅态度很好，问的问题多余···"
+      shop="养车工厂店"
+      shoppic="../../static/img/shoppic1.png"
+      stars="4"
+    ></assessList>
+    <assessList
+      pingfen="5.01"
+      username="M***A"
+      proname="大众 途观"
+      date="2019.08.22"
+      detail="维修师傅态度很好，问的问题多余给你解释很棒，维修师傅态度很好，问的问题多余给你解释很棒，下次保养还回来！维修师傅态度很好，问的问题多余···"
+      shop="养车工厂店"
+      shoppic="../../static/img/shoppic1.png"
+      stars="4"
+    ></assessList>-->
+    <shopdetailAllcomments :shopid="list.goods_id"></shopdetailAllcomments>
+    <shopdetailCommentstop left="规格参数"></shopdetailCommentstop>
+    <view v-for="(i,j) in list.type_guige" :key="j">
+      <shopdetailAttr :left="i.guige_name" :right="i.guige_val"></shopdetailAttr>
+    </view>
+
+    <!-- <shopdetailAttr left="基础油级别 " right="888421"></shopdetailAttr>
+    <shopdetailAttr left="粘稠度 " right="喷油嘴清洗"></shopdetailAttr>
+    <shopdetailAttr left="幅宽 " right="888421"></shopdetailAttr>
+    <shopdetailAttr left="折数 " right="喷油嘴清洗"></shopdetailAttr>-->
+    <shopdetailCommentstop left="商品详情"></shopdetailCommentstop>
+    <shopdetailDetail :strings="list.goods_details"></shopdetailDetail>
+    <view class="bottom">
+      <shopdetailbottom @buy="goumai"></shopdetailbottom>
+    </view>
+    <view class="choosesize">
+      <shopdetailchoosesize
+        :ifchoose="ifchoose"
+        @close="guanbi"
+        :shoppic="list.imgs[0].img_path"
+        :price="list.price"
+        :huaxian="item.price_y"
+        :tags="guige"
+         shoptype=1
+        :msid="list.goods_ms_id"
+        :max="list.pay_num"
+      ></shopdetailchoosesize>
+    </view>
+  </view>
+</template>
+
+<script>
+import shopdetailToppic from "../../components/shopdetail/shopdetail-toppic";
+import shopdetailBtn from "../../components/shopdetail/shopdetail-btn";
+import shopdetailPri from "../../components/shopdetail/shopdetail-pri";
+import shopdetailShopinfo from "../../components/shopdetail/shopdetail-shopname";
+import shopdetailLine from "../../components/shopdetail/shopdetail-line";
+import shopdetailEnsure from "../../components/shopdetail/shopdetail-ensure";
+import shopdetailCommentstop from "../../components/shopdetail/shopdetail-commentstop";
+import assessList from "../../components/assess/assess-list";
+import shopdetailAllcomments from "../../components/shopdetail/shopdetai-allcomments";
+import shopdetailAttr from "../../components/shopdetail/shopdetail-attr";
+import shopdetailDetail from "../../components/shopdetail/shopdetail-detail";
+import shopdetailPinglun from "../../components/shopdetail/shopdetail-pinglun";
+import shopdetailServicelist from "../../components/shopdetail/shopdetail-servicelist";
+import shopdetailbottom from "../../components/shopdetail/shopdetail-bottom";
+import shopdetailchoosesize from "../../components/shopdetail/shopdetail-choosesize";
+import seckillshopdetailname from "../../components/seckill/seckilldetailname";
+import { requestP } from "../../static/js/request";
+export default {
+  components: {
+    shopdetailToppic,
+    shopdetailBtn,
+    shopdetailPri,
+    shopdetailShopinfo,
+    shopdetailLine,
+    shopdetailEnsure,
+    shopdetailCommentstop,
+    assessList,
+    shopdetailAllcomments,
+    shopdetailAttr,
+    shopdetailDetail,
+    shopdetailPinglun,
+    shopdetailServicelist,
+    shopdetailbottom,
+    shopdetailchoosesize,
+    seckillshopdetailname
+  },
+  data() {
+    return {
+      ifsp: "",
+      ifservice: false,
+      ifchoose: "",
+      list: {},
+      pingjia: [],
+      guige:[]
+    };
+  },
+  methods: {
+    shijian(completeTime) {
+      console.log(completeTime);
+      var stime = Date.parse(new Date());
+      var etime = Date.parse(new Date(completeTime));
+      console.log(stime, etime);
+      // 两个时间戳相差的毫秒数
+      var usedTime = etime - stime;
+      // 计算相差的天数
+      var days = Math.floor(usedTime / (24 * 3600 * 1000));
+      // var daysy = Math.floor(usedTime / (24 * 3600 * 1000));
+      //  var leave1 = usedTime % (24 * 3600 * 1000);
+      // 计算天数后剩余的毫秒数
+      var leave1 = usedTime % (24 * 3600 * 1000);
+      // 计算出小时数
+      var hours = Math.floor(leave1 / (3600 * 1000));
+      // 计算小时数后剩余的毫秒数
+      var leave2 = leave1 % (3600 * 1000);
+      // 计算相差分钟数
+      var minutes = Math.floor(leave2 / (60 * 1000));
+      var leave3 = leave2 % (60 * 1000);
+      var s = Math.floor(leave3 / 1000);
+      var time = [days, hours, minutes, s];
+      console.log(time);
+      return time;
+    },
+    change0(e) {
+      // console.log(e)
+      this.ifsp = e;
+    },
+    off(e) {
+      console.log(e);
+      this.ifservice = e;
+    },
+    more(e) {
+      this.ifservice = e;
+    },
+    goumai(e) {
+      console.log(e);
+      this.ifchoose = e;
+    },
+    guanbi(e) {
+      this.ifchoose = e;
+    }
+  },
+  onLoad(e) {
+    console.log(e, "adsfad");
+    requestP({
+      url: "miaosha/get_goods_info",
+      data: {
+        goods_ms_id: e.msid
+      }
+    }).then(res => {
+      res.data.data.endtime = this.shijian(res.data.data.endtime);
+      console.log(res);
+      this.list = res.data.data;
+      this.pinglun = res.data.data.pingjia;
+      let guige = [];
+      for (let i in res.data.data.type_guige) {
+        if (res.data.data.type_guige[i].isuserxz) {
+          guige.push(res.data.data.type_guige[i]);
+        }
+      }
+      
+      this.guige=guige;
+      console.log(this.guige,"mmn")
+    });
+  }
+};
+//视频距离顶部tabbar 165   如果图片尺寸不够就空白，如果够就不留白
+</script>
+
+<style lang="scss">
+.shopdetail {
+  padding-bottom: 200upx;
+}
+.btn {
+  width: 227upx;
+  display: flex;
+  justify-content: space-between;
+  margin: 0 auto;
+  position: absolute;
+  top: 680upx;
+  left: 261upx;
+  bottom: 76upx;
+}
+.pri {
+  margin-bottom: 57upx;
+  margin-left: 26upx;
+}
+.detail {
+  margin: 0 auto;
+  margin-bottom: 46upx;
+  width: 100%;
+}
+.pinglun {
+  padding-left: 32upx;
+  padding-top: 29upx;
+  padding-bottom: 48upx;
+}
+.servicelist {
+  position: fixed;
+  width: 100%;
+  bottom: 0;
+  z-index: 999;
+}
+// .seckilldetail{
+//     // float:right
+// }
+.shopdetailShopinfo {
+  margin-left: 25upx;
+  // padding-bottom:  100upx;
+}
+</style>
\ No newline at end of file
diff --git a/src/pages/serchshaixuan/serchshaixuan.vue b/src/pages/serchshaixuan/serchshaixuan.vue
new file mode 100644
index 0000000..cc03b43
--- /dev/null
+++ b/src/pages/serchshaixuan/serchshaixuan.vue
@@ -0,0 +1,23 @@
+<template>
+  <view class="test">
+      <test></test>
+  </view>
+</template>
+
+<script>
+import test from "../../components/serchshaixuan/serchshaixuan"
+export default {
+    components:{
+        test
+    }
+}
+</script>
+
+<style lang="scss">
+.test{
+    width:570upx;
+    float:right;
+    margin-right: 25upx;
+
+}
+</style>
\ No newline at end of file
diff --git a/src/pages/shaixuan/shaixuan.vue b/src/pages/shaixuan/shaixuan.vue
new file mode 100644
index 0000000..287d589
--- /dev/null
+++ b/src/pages/shaixuan/shaixuan.vue
@@ -0,0 +1,94 @@
+<template>
+  <view class="shaixuan">
+    <shaixuanTop></shaixuanTop>
+    <view class="shaixuanchoice">
+      <shaixuanChoice></shaixuanChoice>
+    </view>
+    <view class="shaixuanchoice1">
+      <shaixuanChoice1 v-on:tuijian="tj" v-on:ifsx="ifsx"></shaixuanChoice1>
+    </view>
+    <view class="shaixuantj" v-if="iftj">
+         <shaixuantj :iftj="iftj" ></shaixuantj>
+    </view>
+    <view class="shaixuannull">
+       <shaixuannull></shaixuannull>
+    </view>
+    <view class="condition">
+      <shaixuancondition :ifcondition="ifcondition" v-on:condition="condition"></shaixuancondition>
+    </view>
+
+  </view>
+</template>
+
+<script>
+import shaixuanTop from "../../components/shaixuan/shaixuan-top";
+import shaixuanChoice from "../../components/shaixuan/shaixuan-choise";
+import shaixuanChoice1 from "../../components/shaixuan/shaixuan-choice1";
+import shaixuantj from "../../components/shaixuan/shaixuantj";
+import shaixuannull from "../../components/shaixuan/shaixuan-null"
+import shaixuancondition from "../../components/shaixuan/shaixuan-condition"
+export default {
+  components: {
+    shaixuanTop,
+    shaixuanChoice,
+    shaixuanChoice1,
+    shaixuantj,
+    shaixuannull,
+    shaixuancondition
+  },
+  data(){
+    return {
+      iftj:false,
+      ifcondition:false
+    }
+  },
+  methods:{
+    tj(e){
+      console.log(e)
+      this.iftj=e
+    },
+    ifsx(e){
+      console.log(e)
+      if(e){
+        this.ifcondition=true;
+      }else{
+         this.ifcondition=false;
+      }
+    },
+    condition(e){
+      console.log(e)
+      this.ifcondition=e
+    }
+  }
+};
+</script>
+
+<style lang="scss">
+Page {
+  background-color: #efefef;
+
+  overflow: hidden;
+}
+.shaixuan {
+  .shaixuanchoice {
+    background-color: white;
+    height: 50upx;
+    position: relative;
+    top: -19rpx;
+  }
+  .shaixuanchoice1{
+    position: relative;
+    top: -19upx;
+  }
+    .shaixuantj{
+    position: relative;
+    top: -19upx;
+    z-index: 9999
+  }
+  .shaixuannull{
+    position: absolute;
+    top: 130upx;
+    z-index: 999;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/pages/shopdetail/shopdetail.vue b/src/pages/shopdetail/shopdetail.vue
new file mode 100644
index 0000000..abb5002
--- /dev/null
+++ b/src/pages/shopdetail/shopdetail.vue
@@ -0,0 +1,241 @@
+<template>
+  <view class="shopdetail">
+    <shopdetailToppic :picarr="list.imgs" v-on:btnchange="change0"></shopdetailToppic>
+    <view class="btn">
+      <shopdetailBtn :ifsp="ifsp" btn1="视频"></shopdetailBtn>
+      <shopdetailBtn btn1="图片" :ifsp="!ifsp"></shopdetailBtn>
+    </view>
+    <view class="pri">
+      <shopdetailPri pri="45"></shopdetailPri>
+    </view>
+    <view class="detail">
+      <shopdetailShopinfo :shopname="list.goods_name" :shopdesc="list.goods_ms"></shopdetailShopinfo>
+    </view>
+    <view class="servicelist" v-if="ifservice">
+      <shopdetailServicelist ifservice="ifservice" v-on:turnoff="off"></shopdetailServicelist>
+    </view>
+
+    <shopdetailLine></shopdetailLine>
+    <shopdetailEnsure
+      ensurepic="../../static/img/ensure.png"
+      ensures="全正品,价格低,放心购,快送达"
+      v-on:more="more"
+    ></shopdetailEnsure>
+    <shopdetailLine></shopdetailLine>
+
+    <shopdetailCommentstop left="商品评论" :right="'好评率'+list.pingjia_haopinglv" ifarrow="true"></shopdetailCommentstop>
+    <!-- <view class="pinglun">
+      <shopdetailPinglun content="产品好 正品 43,下次还来 13,价格低 5,性价比高 4,服务好 3,性价比高 4"></shopdetailPinglun>
+    </view>-->
+    <view v-for="(item,j) in list.pingjia" :key="j">
+      <assessList
+        :pingfen="item.xing"
+        :username="item.uname"
+        :userpic="item.avatar_url"
+        proname
+        :date="item.pingjia_time"
+        :detail="item.comment"
+        :buydate="item.pay_time"
+        shoppic="../../static/img/shoppic1.png"
+        :stars="item.xing"
+        :pinglunpic="item.imgs"
+      ></assessList>
+    </view>
+    <!-- <assessList
+      pingfen="5.01"
+      username="M***A"
+      proname="大众 途观"
+      date="2019.08.22"
+      detail="维修师傅态度很好，问的问题多余给你解释很棒，维修师傅态度很好，问的问题多余给你解释很棒，下次保养还回来！维修师傅态度很好，问的问题多余···"
+      shop="养车工厂店"
+      shoppic="../../static/img/shoppic1.png"
+      stars="4"
+    ></assessList>
+    <assessList
+      pingfen="5.01"
+      username="M***A"
+      proname="大众 途观"
+      date="2019.08.22"
+      detail="维修师傅态度很好，问的问题多余给你解释很棒，维修师傅态度很好，问的问题多余给你解释很棒，下次保养还回来！维修师傅态度很好，问的问题多余···"
+      shop="养车工厂店"
+      shoppic="../../static/img/shoppic1.png"
+      stars="4"
+    ></assessList>
+    <assessList
+      pingfen="5.01"
+      username="M***A"
+      proname="大众 途观"
+      date="2019.08.22"
+      detail="维修师傅态度很好，问的问题多余给你解释很棒，维修师傅态度很好，问的问题多余给你解释很棒，下次保养还回来！维修师傅态度很好，问的问题多余···"
+      shop="养车工厂店"
+      shoppic="../../static/img/shoppic1.png"
+      stars="4"
+    ></assessList>-->
+    <shopdetailAllcomments :shopid="list.goods_id"></shopdetailAllcomments>
+    <shopdetailCommentstop left="规格参数"></shopdetailCommentstop>
+    <view v-for="(i,j) in list.type_guige" :key="j">
+      <shopdetailAttr :left="i.guige_name" :right="i.guige_val"></shopdetailAttr>
+    </view>
+    <!-- <shopdetailAttr left="品牌 " right="胜牌/Aalvoline"></shopdetailAttr>
+    <shopdetailAttr left="基础油级别 " right="888421"></shopdetailAttr>
+    <shopdetailAttr left="粘稠度 " right="喷油嘴清洗"></shopdetailAttr>
+    <shopdetailAttr left="幅宽 " right="888421"></shopdetailAttr>
+    <shopdetailAttr left="折数 " right="喷油嘴清洗"></shopdetailAttr>-->
+    <shopdetailCommentstop left="商品详情"></shopdetailCommentstop>
+    <shopdetailDetail :strings="list.goods_details"></shopdetailDetail>
+    <view class="bottom">
+      <shopdetailbottom @buy="goumai" shoptype=1></shopdetailbottom>
+    </view>
+    <view class="choosesize">
+      <shopdetailchoosesize
+        :ifchoose="ifchoose"
+        @close="guanbi"
+        :shoppic="list.imgs[0].img_path"
+        :price="list.price"
+        :huaxian="item.price_y"
+        :tags="guige"
+        @tagchange="tagchange"
+        shoptype=0
+        :shopid="list.goods_id"
+        :kucun="list.kc_num"
+      ></shopdetailchoosesize>
+    </view>
+  </view>
+</template>
+
+<script>
+import shopdetailToppic from "../../components/shopdetail/shopdetail-toppic";
+import shopdetailBtn from "../../components/shopdetail/shopdetail-btn";
+import shopdetailPri from "../../components/shopdetail/shopdetail-pri";
+import shopdetailShopinfo from "../../components/shopdetail/shopdetail-shopname";
+import shopdetailLine from "../../components/shopdetail/shopdetail-line";
+import shopdetailEnsure from "../../components/shopdetail/shopdetail-ensure";
+import shopdetailCommentstop from "../../components/shopdetail/shopdetail-commentstop";
+import assessList from "../../components/assess/assess-list";
+import shopdetailAllcomments from "../../components/shopdetail/shopdetai-allcomments";
+import shopdetailAttr from "../../components/shopdetail/shopdetail-attr";
+import shopdetailDetail from "../../components/shopdetail/shopdetail-detail";
+import shopdetailPinglun from "../../components/shopdetail/shopdetail-pinglun";
+import shopdetailServicelist from "../../components/shopdetail/shopdetail-servicelist";
+import shopdetailbottom from "../../components/shopdetail/shopdetail-bottom";
+import shopdetailchoosesize from "../../components/shopdetail/shopdetail-choosesize";
+import { requestP } from "../../static/js/request";
+export default {
+  components: {
+    shopdetailToppic,
+    shopdetailBtn,
+    shopdetailPri,
+    shopdetailShopinfo,
+    shopdetailLine,
+    shopdetailEnsure,
+    shopdetailCommentstop,
+    assessList,
+    shopdetailAllcomments,
+    shopdetailAttr,
+    shopdetailDetail,
+    shopdetailPinglun,
+    shopdetailServicelist,
+    shopdetailbottom,
+    shopdetailchoosesize
+  },
+  data() {
+    return {
+      ifsp: "",
+      ifservice: false,
+      ifchoose: "",
+      list: [],
+      guige:[],
+      typestr:""
+    };
+  },
+  onLoad(e) {
+    requestP({
+      url: "goods/get_goods_info",
+      data: {
+        goods_id: e.shopid
+      }
+    }).then(res => {
+      console.log(res);
+      this.list = res.data.data;
+      let guige = [];
+      for (let i in res.data.data.type_guige) {
+        if (res.data.data.type_guige[i].isuserxz) {
+          guige.push(res.data.data.type_guige[i]);
+        }
+      }
+      this.guige = guige;
+      console.log(this.guige,1111)
+    });
+  },
+  methods: {
+    change0(e) {
+      // console.log(e)
+      this.ifsp = e;
+    },
+    off(e) {
+      console.log(e);
+      this.ifservice = e;
+    },
+    more(e) {
+      this.ifservice = e;
+    },
+    goumai(e) {
+      console.log(e);
+      this.ifchoose = e;
+      // console.log(this.list.goods_id)
+    },
+    guanbi(e) {
+      this.ifchoose = e;
+    },
+    tagchange(e){
+      this.typestr=e
+      console.log(e,1996)
+    },
+    gwc(e){
+      if(e){
+        // requestP({
+        //   url:"shop_cart/add_cart",
+        //   data:{
+        //     goods_id:this.list.goods_id,
+        //       goods_guige:this.typestr
+        //   }
+        // }).then((res)=>{
+        //   console.log(res)
+        // })
+      }
+    }
+  },  
+};
+//视频距离顶部tabbar 165   如果图片尺寸不够就空白，如果够就不留白
+</script>
+
+<style lang="scss">
+.btn {
+  width: 227upx;
+  display: flex;
+  justify-content: space-between;
+  margin: 0 auto;
+  position: relative;
+  bottom: 76upx;
+}
+.pri {
+  margin-bottom: 57upx;
+  margin-left: 26upx;
+}
+.detail {
+  margin: 0 auto;
+  margin-bottom: 46upx;
+  width: 687upx;
+}
+.pinglun {
+  padding-left: 32upx;
+  padding-top: 29upx;
+  padding-bottom: 48upx;
+}
+.servicelist {
+  position: fixed;
+  width: 100%;
+  bottom: 0;
+  z-index: 999;
+}
+</style>
\ No newline at end of file
diff --git a/src/pages/shopping/shopping.vue b/src/pages/shopping/shopping.vue
new file mode 100644
index 0000000..5505c74
--- /dev/null
+++ b/src/pages/shopping/shopping.vue
@@ -0,0 +1,247 @@
+<template>
+  <view>
+    <view class="shopping" v-if="list.length==0">
+      <shoppingCartnull picurl="../../static/img/shoppingnull.png" ale="购物车暂无商品"></shoppingCartnull>
+    </view>
+    <view v-else>
+      <shoppingCarttittle @getyhq="getyhq"></shoppingCarttittle>
+      <shoppingCartshop
+        v-for="(i,j) in list"
+        :key="j"
+        @del="del"
+        :shoppic="i.imgpaththumb"
+        :money="i.price"
+        :shopname="i.goods_name"
+        :num="i.num"
+        :no="j"
+        @selected="ifselected"
+        :ifxz="choose[j]"
+      ></shoppingCartshop>
+      <!-- <shoppingCartshop shoppic="../../static/img/cartshop.png" money="154.05"  shopname="360记录仪M301plus+4G卡" num=9 no=1 @selected="ifselected" :ifxz="choose[1]"></shoppingCartshop>
+      <shoppingCartshop shoppic="../../static/img/cartshop.png" money="154.05"  shopname="360记录仪M301plus+4G卡" num=9 no=2 @selected="ifselected" :ifxz="choose[2]"></shoppingCartshop>-->
+
+      <shoppingCartbottom
+        class="heji"
+        :price="bottom[1]"
+        :sum="bottom[2]"
+        :all="bottom[3]"
+        @selectAll="selectAll"
+        @jiesuan="jiesuan"
+      ></shoppingCartbottom>
+    </view>
+    <view class="youhui" v-if="ifyh">
+      <youhui :ifyouhui="ifyh" v-on:off="off" :yhqall="yhqall"></youhui>
+    </view>
+  </view>
+</template>
+
+<script>
+import shoppingCartnull from "../../components/shopping/cartnull";
+import shoppingCarttittle from "../../components/shopping/carttittle";
+import shoppingCartshop from "../../components/shopping/cartshop";
+import shoppingCartbottom from "../../components/shopping/cartbottom";
+import youhui from "../../components/ordersub/ordersub-youhui";
+import { requestP } from "../../static/js/request";
+export default {
+  components: {
+    shoppingCartnull,
+    shoppingCarttittle,
+    shoppingCartshop,
+    shoppingCartbottom,
+    youhui
+  },
+  data() {
+    return {
+      choose: [],
+      order: 0,
+      list: [],
+      bottom: [0, 0, 0, 0],
+      ifyh: false,
+      yhqall: [],
+      goodsids:[]
+    };
+  },
+  methods: {
+    youhui() {
+      this.ifyh = true;
+    },
+    off(e) {
+      this.ifyh = e;
+    },
+    getyhq(e) {
+      this.ifyh = e;
+    },
+    del(no) {
+      console.log(this.list[no].cart_id);
+      requestP({
+        url: "shop_cart/del",
+        data: {
+          cart_id: this.list[no].cart_id
+        }
+      }).then(res => {
+        console.log(res.data.code, "code");
+        if (res.data.code) {
+          wx.showToast({
+            title: "删除成功",
+            icon: "success",
+            duration: 2000 //持续的时间
+          });
+          requestP({
+            url: "shop_cart/get_list"
+          }).then(res => {
+            console.log(res);
+            this.list = res.data.data;
+            console.log(res.data.data.length == 0, 585);
+            for (let i in this.list) {
+              this.choose[i] = false;
+              this.list[i].price = parseFloat(this.list[i].price);
+            }
+          });
+        }
+      });
+    },
+    selectAll(all) {
+      this.bottom = [0, 0, 0, 0];
+      this.$set(this.bottom, 3, all);
+      for (let i in this.choose) {
+        this.$set(this.choose, i, all);
+        if (all) {
+          this.$set(
+            this.bottom,
+            1,
+            this.bottom[1] + this.list[i].price * 100 * this.list[i].num
+          );
+          this.$set(this.bottom, 2, this.bottom[2] + this.list[i].num);
+        }
+      }
+    },
+    ifselected(e) {
+      // this.choose=e
+
+      this.$set(this.choose, e[1], e[0]);
+
+      // console.log(i)
+      this.statistics();
+      console.log(this.choose, "xuanzew");
+      //    for (let i = 0; i < this.list.length; i++) {
+      //     if (this.choose[i]==true) {
+      //       // console.log(this.list[i].goods_id, "goodsid");
+      //       this.goodsids.push(this.list[i].goods_id)
+      //   }
+      // }
+      // this.$set(this.tag, i, this.tag[i]=="tag"?"tag1":"tag");
+      // this.$set(this.choose,"choose",e)
+      // console.log(this.xuanze,98)
+    },
+    statistics() {
+      var count = 0;
+      this.bottom = [0, 0, 0, 0];
+      for (let i in this.choose) {
+        if (this.choose[i]) {
+          count++;
+          this.$set(
+            this.bottom,
+            1,
+            this.bottom[1] + this.list[i].price * 100 * this.list[i].num
+          );
+          this.$set(this.bottom, 2, this.bottom[2] + this.list[i].num);
+        }
+      }
+      if (count == this.choose.length) {
+        this.$set(this.bottom, 3, true);
+      }
+    },
+    order1(e) {
+      console.log(e, "asd1");
+      this.order = e;
+    },
+    jiesuan() {
+      // for (let i = 0; i < this.list.length; i++) {
+      //     if (this.choose[i]==true) {
+      //       // console.log(this.list[i].goods_id, "goodsid");
+      //       this.goodsids.push(this.list[i].goods_id)
+      //   }
+      // }
+      // this.choose.
+      let arr = []
+      for(let i in this.choose){
+        if(this.choose[i]){
+          arr.push(this.list[i].cart_id)
+        }
+      }
+      requestP({
+        url:"pay/pay_cart",
+        data:{
+          cart_ids:arr.join(",")
+        }
+      }).then((res)=>{
+      uni.setStorageSync("ordersubinfo",res.data)
+      uni.setStorageSync("cart_ids",arr)
+
+        uni.navigateTo({
+        url:"../order-sub/order-sub?shoptype=" + 3
+      })
+      })
+      
+    //  console.log(this.goodsids)
+    }
+  },
+  mounted() {
+    requestP({
+      url: "shop_cart/get_list"
+    }).then(res => {
+      console.log(res);
+      this.list = res.data.data;
+      for (let i in this.list) {
+        this.choose[i] = false;
+        this.list[i].price = parseFloat(this.list[i].price);
+      }
+    });
+
+    requestP({
+      url: "youhuiquan/get_list_all"
+    }).then(res => {
+      console.log(res, "youhui");
+      this.yhqall = res.data.data;
+    });
+  },
+  onShow(){
+    this.choose = [],
+      this.order = 0,
+      this.list = [],
+      this.bottom = [0, 0, 0, 0],
+      this.ifyh = false,
+      this.yhqall = [],
+      this.goodsids =[]
+    requestP({
+      url: "shop_cart/get_list"
+    }).then(res => {
+      console.log(res);
+      this.list = res.data.data;
+      for (let i in this.list) {
+        this.choose[i] = false;
+        this.list[i].price = parseFloat(this.list[i].price);
+      }
+    });
+
+    requestP({
+      url: "youhuiquan/get_list_all"
+    }).then(res => {
+      console.log(res, "youhui");
+      this.yhqall = res.data.data;
+    });
+  }
+};
+// isnull 判断购物车是否为空   true 为空，false不为空
+</script>
+
+<style lang="scss">
+page {
+  background-color: #f6f6f6;
+}
+.heji {
+  width: 100%;
+  position: fixed;
+  bottom: 0;
+}
+</style>
\ No newline at end of file
diff --git a/src/pages/shopservice/shopservice.vue b/src/pages/shopservice/shopservice.vue
new file mode 100644
index 0000000..accb080
--- /dev/null
+++ b/src/pages/shopservice/shopservice.vue
@@ -0,0 +1,24 @@
+<template>
+  <view class="shopservice">
+      <shopserviceTitle></shopserviceTitle>
+      <shopserviceShop shoppic="../../static/img/serviceshop.png" shopname="轮胎/汽车轮胎 205/55R16 91V 韧悦 ENERGY XM2 " pri=65 num=2></shopserviceShop>
+  </view>
+</template>
+
+<script>
+import shopserviceTitle from '../../components/shopservice/shopservice-title';
+import shopserviceShop from "../../components/shopservice/shopservice-shop"
+export default {
+components:{
+    shopserviceTitle,
+    shopserviceShop
+}
+}
+</script>
+
+<style lang="scss">
+page{
+    background-color: #EEEEEE;
+
+}
+</style>
\ No newline at end of file
diff --git a/src/pages/suggest/suggest.vue b/src/pages/suggest/suggest.vue
new file mode 100644
index 0000000..b77874f
--- /dev/null
+++ b/src/pages/suggest/suggest.vue
@@ -0,0 +1,33 @@
+<template>
+  <view class="suggest">
+      <suggestionLIne></suggestionLIne>
+      <suggestionTop></suggestionTop>
+      <suggestionLIne></suggestionLIne>
+      <view class="mid">
+            <suggestionMid></suggestionMid>
+      </view>
+          <suggestionLIne></suggestionLIne>
+          <suggestionBottom></suggestionBottom>
+  </view>
+</template>
+
+<script>
+import suggestionTop from "../../components/suggestion/suggestion-top";
+import suggestionLIne from "../../components/suggestion/suggestion-line"
+import suggestionMid from "../../components/suggestion/suggestion-mid"
+import suggestionBottom from "../../components/suggestion/suggestion-bottom"
+export default {
+components:{
+suggestionTop,
+suggestionLIne,
+suggestionMid,
+suggestionBottom
+}
+}
+</script>
+
+<style lang="scss">
+.mid{
+    margin-bottom: 21upx;
+}
+</style>
\ No newline at end of file
diff --git a/src/pages/suggestion/suggestion.vue b/src/pages/suggestion/suggestion.vue
new file mode 100644
index 0000000..83da7df
--- /dev/null
+++ b/src/pages/suggestion/suggestion.vue
@@ -0,0 +1,21 @@
+<template>
+  <view class="suggestion">
+      <suggestionNull picurl="../../static/img/successale.png" ale="反馈成功"></suggestionNull>
+  </view>
+</template>
+
+<script>
+import suggestionNull from "../../components/suggestion/suggestionnull"
+export default {
+    name:"suggestion",
+    components:{
+        suggestionNull
+    }
+}
+</script>
+
+<style lang="scss">
+.suggestion{
+
+}
+</style>
\ No newline at end of file
diff --git a/src/pages/type/type.vue b/src/pages/type/type.vue
new file mode 100644
index 0000000..56076a1
--- /dev/null
+++ b/src/pages/type/type.vue
@@ -0,0 +1,258 @@
+<template>
+	<view class="page-body" :style="'height:'+height+'px'">
+		<scroll-view class="nav-left" scroll-y :style="'height:'+height+'px'" :scroll-top="scrollLeftTop" scroll-with-animation>
+			<view class="nav-left-item" @click="categoryClickMain(index,item.name)" :key="index" :class="index==categoryActive?'active':''"
+				v-for="(item,index) in classifyData">
+				{{item.name}}
+			</view>
+		</scroll-view>
+		<scroll-view class="nav-right" scroll-y :scroll-top="scrollTop" @scroll="scroll" :style="'height:'+height+'px'" scroll-with-animation>
+			<view v-for="(foods,index) in classifyData" :key="index" class="box">
+						<view class="rightname">
+				<view>{{foods.name}}</view>
+				<view class="right">
+					<!-- <text class="right1">点击适配</text> -->
+					<img src="../../static/img/arrowmini.png" alt="" class="arrowmini">
+ 					</view>
+			</view>
+				<view :id="i==0?'first':''" class="nav-right-item" v-for="(item,i) in foods.foods" :key="i" @click="cart(item.key)">
+					<image :src="item.icon" />
+					<view class="kindname">{{item.name}}</view>
+				</view>
+			</view>
+		</scroll-view>
+		<view class="tabbar">
+			<tabbar page=3></tabbar>
+		</view>
+	</view>
+</template>
+
+<script>
+	// import classifyData from '../../static/classify.data.js';
+	import {requestP} from "../../static/js/request"
+	import tabbar from "../../components/tabbar/tabbar"
+	export default {
+		data() {
+			return {
+				name: "wkiwi",
+				height: 0,
+				categoryActive: 0,
+				scrollTop: 0,
+				scrollLeftTop: 0,
+				// scrollHeight: 0,
+				// classifyData:classifyData,
+				arr:[0,584,1168,1752,2336,2805,3274,3858,4442,4911,5380,5734,6203,6672,7017],//初始值，后边计算会根据手机适配覆盖
+				leftItemHeight: 51,//49行会计算出新值进行覆盖
+				navLeftHeight:0,//左边scroll-view 内层nav的总高度
+				diff: 0,//左边scroll-view 内层nav的总高度与视口之差
+				tabBarHeight:0,//如果此页面为Tab页面，自己改变高度值,,一般tab高度为51
+				classifyData:{},
+				set:0
+			}
+		},
+		components:{
+			tabbar
+		},
+		created(){
+			//如果你的分类数据为后台异步获取请	将下方代码放置你的数据回调中
+			// this.$nextTick(()=>{
+			// 	this.getHeightList();
+			// })
+		},
+		onLoad: function () {
+			this.height = uni.getSystemInfoSync().windowHeight - this.tabBarHeight;
+			requestP({
+				url:"/goods/get_goods_cat"
+			}).then((res)=>{
+				console.log(res)
+				this.classifyData = res.data.data
+			})
+		},
+		onReady() {
+			this.set = setInterval(() => {
+				this.getHeightList();
+			}, 3000);
+			
+		},
+		methods: {
+			getHeightList(){
+				try {
+					let _this = this;
+				let selectorQuery=uni.createSelectorQuery();
+				
+				selectorQuery.selectAll('.nav-left-item').boundingClientRect(function(rects) {
+					// console.log(rects)
+					_this.leftItemHeight  =  rects[0].height;
+					_this.navLeftHeight = _this.leftItemHeight * this.classifyData.length;
+					_this.diff =  _this.navLeftHeight - _this.height;
+				});
+				selectorQuery.selectAll('.box').boundingClientRect(function(rects) {
+					let arr = [0];
+					let top = 0;
+					rects.forEach(function(rect){
+	// 					rect.id      // 节点的ID
+	// 					rect.dataset // 节点的dataset
+	// 					rect.left    // 节点的左边界坐标
+	// 					rect.right   // 节点的右边界坐标
+	// 					rect.top     // 节点的上边界坐标
+	// 					rect.bottom  // 节点的下边界坐标
+	// 					rect.width   // 节点的宽度
+	// 					rect.height  // 节点的高度
+						top += rect.height;
+						arr.push(top)
+						})
+						console.log(arr)
+						_this.arr = arr
+						// clearInterval(_this.set)
+						if(_this.arr.length > 1){
+							clearInterval(_this.set)
+							console.log("jieshu")
+						}
+					}).exec()
+					
+				} catch (error) {
+					console.log("失败")
+				}
+				
+			},
+			scroll(e) {
+				let _this = this
+				if(this.timeoutId){
+					clearTimeout(this.timeoutId);
+				}
+				this.timeoutId = setTimeout(function(){ //节流
+					_this.scrollHeight = e.detail.scrollTop + 1 + _this.height/2;
+					//+1不要删除，解决最后一项某种情况下翻到底部，左边按钮并不会切换至最后一个
+					//若想使切换参考线为屏幕顶部请删除 _this.height/2
+					for (let i = 0; i < _this.arr.length;i++) {
+						let height1 = _this.arr[i];
+						let height2 = _this.arr[i+1];
+						if (!height2 || (_this.scrollHeight >= height1 && _this.scrollHeight < height2)) {
+							_this.categoryActive = i;
+							(_this.diff>0) && (_this.scrollLeftTop = Math.round((_this.categoryActive * _this.diff)/(this.classifyData.length-1)));
+							return false;
+						}
+					}
+					_this.categoryActive = 0;
+					_this.timeoutId = undefined;
+				}, 10)
+			},
+			categoryClickMain(index,kindname) {
+				this.categoryActive = index;
+				this.scrollTop == this.arr[index] ? this.scrollTop = this.scrollTop+1 : this.scrollTop = this.arr[index]//防止两次相等造成点击不触发滚动时间
+			},
+			cart: function (text) {
+				// uni.showToast({
+				// 	title: "" + text,
+				// 	icon: "none",
+				// })
+				// console.log(text,"这是啥")
+				uni.navigateTo({
+					url:"/pages/search/search?typeid="+text
+				})
+			}
+		},
+		components: {
+		}
+	}
+</script>
+
+<style>
+	.page-body {
+		display: flex;
+		background: #fff;
+        color: #545454;
+		overflow: hidden;
+	}
+
+	.nav {
+		display: flex;
+		width: 100%;
+	}
+
+	.nav-left {
+		width: 25%;
+		background: #fafafa;
+	}
+
+	.nav-left-item {
+		height: 100upx;
+		border-right: solid 1px #f1f1f1;
+		border-bottom: solid 1px #f1f1f1;
+		font-size: 24upx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+	.nav-left-item:last-child{
+		border-bottom: none;
+	}
+	.nav-right {
+		width: 75%;
+	}
+	.box {
+		display: block;
+		overflow: hidden;
+		/* border-bottom: 20upx solid #f3f3f3; */
+		/* min-height: 100vh; */ 
+		/*若您的子分类过少想使得每个子分类占满屏请放开上边注视 */
+	}
+	.box:last-child {
+		border: none;
+		min-height:100vh;
+	}
+	.nav-right-item {
+		width: 28%;
+		float: left;
+		text-align: center;
+		padding: 11upx;
+		font-size: 28upx;
+		background: #fff;
+		margin-bottom: 62upx;
+	}
+
+	.nav-right-item image {
+		width: 173upx;
+		height: 54upx;
+	}
+
+	.active {
+		background: #F0F0F0;
+		border-right: 0;
+	}
+	::-webkit-scrollbar {/*取消小程序的默认导航条样式*/
+   width: 0;
+   height: 0;
+   color: transparent;
+}
+.kindname{
+	margin-top:39upx;
+	text-indent: 15upx;
+}
+.rightname{
+	width: 573upx;
+	height: 96upx;
+	background-color: #F0F0F0;
+	line-height: 96upx;
+	display: flex;
+	justify-content: space-between;
+	color: #545454;
+	font-size: 24upx;
+}
+.arrowmini{
+	width: 7upx;
+	height: 11upx;
+	margin-left: 16upx;
+	position: relative;
+	bottom:8upx;
+}
+.right{
+	margin-right: 24upx;
+}
+.tabbar{
+	    width: 100%;
+    background-color: white;
+    position: fixed;
+    bottom: 0;
+}
+</style>
\ No newline at end of file
diff --git a/src/pages/xzcx/xzcx.vue b/src/pages/xzcx/xzcx.vue
new file mode 100644
index 0000000..0992387
--- /dev/null
+++ b/src/pages/xzcx/xzcx.vue
@@ -0,0 +1,26 @@
+<template>
+<view>
+   <proyearCarinfo></proyearCarinfo>
+<proyearChoose desc="0.8L" ifarrow=true ifchoosecx="true" cx="2001"></proyearChoose>
+<proyearChoosetitle desc="选择车型"></proyearChoosetitle>
+<proyearChoose ifline=true desc="2001款 0.8L 手动 国Ⅱ"></proyearChoose>
+<proyearChoose ifline=true desc="2001款 0.8L 手动 国Ⅲ"></proyearChoose>
+<proyearChoose ifline=true desc="2001款 0.8L 手动 国Ⅲ"></proyearChoose>
+<proyearChoose ifline=true desc="2001款 0.8L 手动 国Ⅲ"></proyearChoose>
+</view>
+
+</template>
+<script>
+import proyearCarinfo from "../../components/proyear/proyear-carinfo";
+import proyearChoose from "../../components/proyear/proyear-choose";
+import proyearChoosetitle from '../../components/proyear/proyear-choosetitle'
+export default {
+  components: {
+    proyearCarinfo,
+    proyearChoose,
+    proyearChoosetitle
+  }
+};
+</script>
+<style lang="scss" scoped>
+</style>
\ No newline at end of file
diff --git a/src/pages/xzcxlist/xzcxlist.vue b/src/pages/xzcxlist/xzcxlist.vue
new file mode 100644
index 0000000..ee34158
--- /dev/null
+++ b/src/pages/xzcxlist/xzcxlist.vue
@@ -0,0 +1,61 @@
+<template>
+  <view class="xzlist">
+<searchShuru  content="汽车品牌关键字"></searchShuru>
+<xzcxlistTitle title="热门品牌"></xzcxlistTitle>
+<xzcxlistIconList :iconlist="list.list_hot"></xzcxlistIconList>
+<view v-for="(i,j) in list.list_barand" :key="j">
+<xzcxlistTitle :title="i.szm" class="title"></xzcxlistTitle>
+<xzcxlistCars v-for="(item,index) in i.brand_list" :key="index" :carpic="item.brand_logo" :carname="item.brand_name" class="car"></xzcxlistCars>
+<!-- <xzcxlistCars carpic="../../static/img/caricon1.png" carname="阿尔法·罗密欧zz" class="car"></xzcxlistCars>
+<xzcxlistCars carpic="../../static/img/caricon1.png" carname="阿尔法·罗密欧zz" class="car"></xzcxlistCars>
+<xzcxlistCars carpic="../../static/img/caricon1.png" carname="阿尔法·罗密欧zz" class="car"></xzcxlistCars> -->
+</view>
+
+<!-- <xzcxlistTitle title="B" class="title"></xzcxlistTitle>
+<xzcxlistCars carpic="../../static/img/caricon1.png" carname="阿尔法·罗密欧zz" class="car"></xzcxlistCars>
+<xzcxlistCars carpic="../../static/img/caricon1.png" carname="阿尔法·罗密欧zz" class="car"> </xzcxlistCars>
+<xzcxlistCars carpic="../../static/img/caricon1.png" carname="阿尔法·罗密欧zz" class="car"></xzcxlistCars>
+<xzcxlistCars carpic="../../static/img/caricon1.png" carname="阿尔法·罗密欧zz" class="car"></xzcxlistCars> -->
+  </view>
+</template>
+
+<script>
+import searchShuru from "../../components/search/searchShuru";
+import xzcxlistTitle from "../../components/xzcxlist/xzcxlist-title";
+import xzcxlistIcon from "../../components/xzcxlist/xzcxlist-icon";
+import xzcxlistIconList from "../../components/xzcxlist/xzcxlist-iconlist"
+import xzcxlistCars from "../../components/xzcxlist/xzcxlist-cars"
+import {requestP} from "../../static/js/request"
+export default {
+    components:{
+        searchShuru,
+        xzcxlistTitle,
+        xzcxlistIcon,
+        xzcxlistIconList,
+        xzcxlistCars
+    },
+    data(){
+        return{
+            list:[]
+        }
+    },
+    onLoad(){
+        requestP({
+            url:"car/get_brand_list",
+        }).then((res)=>{
+            console.log(res)
+            this.list=res.data.data
+        })
+    }
+}
+</script>
+
+<style lang="scss">
+.title{
+    position: relative;
+    top: 26upx;
+}
+    .car{
+        margin-top: 25upx;
+    }
+</style>
\ No newline at end of file
diff --git a/src/static/classify.data.js b/src/static/classify.data.js
new file mode 100644
index 0000000..ac2b3d2
--- /dev/null
+++ b/src/static/classify.data.js
@@ -0,0 +1,169 @@
+export default[
+   {
+      "name": "轮胎品牌区",
+      "foods": [
+          {
+            "name": "米其林",
+            "key": "米其林",
+            "icon": "../../static/img/kind.png",
+            "cat": 10
+          },
+          {
+            "name": "德国马牌1",
+            "key": "德国马牌",
+            "icon": "../../static/img/kind1.png",
+            "cat": 10
+          },
+          {
+            "name": "固特异",
+            "key": "固特异",
+            "icon": "../../static/img/kind2.png",
+            "cat": 10
+          },
+          {
+            "name": "米其林",
+            "key": "米其林",
+            "icon": "../../static/img/kind.png",
+            "cat": 10
+          },
+          {
+            "name": "德国马牌",
+            "key": "德国马牌",
+            "icon": "../../static/img/kind1.png",
+            "cat": 10
+          },
+          {
+            "name": "固特异",
+            "key": "固特异",
+            "icon": "../../static/img/kind2.png",
+            "cat": 10
+          },
+          {
+            "name": "米其林",
+            "key": "米其林",
+            "icon": "../../static/img/kind.png",
+            "cat": 10
+          },
+          {
+            "name": "德国马牌",
+            "key": "德国马牌",
+            "icon": "../../static/img/kind1.png",
+            "cat": 10
+          },
+          {
+            "name": "固特异",
+            "key": "固特异",
+            "icon": "../../static/img/kind2.png",
+            "cat": 10
+          },
+      ]
+   },
+   {
+    "name": "轮胎品牌区",
+    "foods": [
+        {
+            "name": "米其林",
+            "key": "米其林",
+            "icon": "../../static/img/kind.png",
+            "cat": 10
+          },
+          {
+            "name": "德国马牌",
+            "key": "德国马牌",
+            "icon": "../../static/img/kind1.png",
+            "cat": 10
+          },
+          {
+            "name": "固特异",
+            "key": "固特异",
+            "icon": "../../static/img/kind2.png",
+            "cat": 10
+          },
+        ]
+    },
+    {
+        "name": "保养品牌区",
+        "foods": [
+            {
+                "name": "米其林",
+                "key": "米其林",
+                "icon": "../../static/img/kind.png",
+                "cat": 10
+              },
+              {
+                "name": "德国马牌",
+                "key": "德国马牌",
+                "icon": "../../static/img/kind1.png",
+                "cat": 10
+              },
+              {
+                "name": "固特异",
+                "key": "固特异",
+                "icon": "../../static/img/kind2.png",
+                "cat": 10
+              },
+              {
+                "name": "米其林",
+                "key": "米其林",
+                "icon": "../../static/img/kind.png",
+                "cat": 10
+              },
+              {
+                "name": "德国马牌",
+                "key": "德国马牌",
+                "icon": "../../static/img/kind1.png",
+                "cat": 10
+              },
+              {
+                "name": "固特异",
+                "key": "固特异",
+                "icon": "../../static/img/kind2.png",
+                "cat": 10
+              },
+
+        ]
+    },
+    {
+        "name": "车品品牌区",
+        "foods": [
+         
+        ]
+    },
+    {
+        "name": "常规保养",
+        "foods": [
+         
+        ]
+    },
+    {
+        "name": "常用配件",
+        "foods": [
+         
+        ]
+    },
+    {
+        "name": "空调养护",
+        "foods": [
+        
+        ]
+    },
+    {
+        "name": "刹车养护",
+        "foods": [
+         
+        ]
+    },
+    {
+        "name": "水箱养护",
+        "foods": [
+           
+        ]
+    },
+    {
+        "name": "除碳提动力",
+        "foods": [
+       
+        ]
+    },
+  
+]
\ No newline at end of file
diff --git a/src/static/img/ad.png b/src/static/img/ad.png
new file mode 100644
index 0000000..d0460da
Binary files /dev/null and b/src/static/img/ad.png differ
diff --git a/src/static/img/add.png b/src/static/img/add.png
new file mode 100644
index 0000000..f124b80
Binary files /dev/null and b/src/static/img/add.png differ
diff --git a/src/static/img/add1.png b/src/static/img/add1.png
new file mode 100644
index 0000000..bbaa34c
Binary files /dev/null and b/src/static/img/add1.png differ
diff --git a/src/static/img/addicon.png b/src/static/img/addicon.png
new file mode 100644
index 0000000..8ed408a
Binary files /dev/null and b/src/static/img/addicon.png differ
diff --git a/src/static/img/addnewcar.png b/src/static/img/addnewcar.png
new file mode 100644
index 0000000..1de7f1f
Binary files /dev/null and b/src/static/img/addnewcar.png differ
diff --git a/src/static/img/addr-add.png b/src/static/img/addr-add.png
new file mode 100644
index 0000000..68c66dd
Binary files /dev/null and b/src/static/img/addr-add.png differ
diff --git a/src/static/img/alert.png b/src/static/img/alert.png
new file mode 100644
index 0000000..71d58d1
Binary files /dev/null and b/src/static/img/alert.png differ
diff --git a/src/static/img/arrow.png b/src/static/img/arrow.png
new file mode 100644
index 0000000..fd7af53
Binary files /dev/null and b/src/static/img/arrow.png differ
diff --git a/src/static/img/arrowdown.png b/src/static/img/arrowdown.png
new file mode 100644
index 0000000..7992e10
Binary files /dev/null and b/src/static/img/arrowdown.png differ
diff --git a/src/static/img/arrowmini.png b/src/static/img/arrowmini.png
new file mode 100644
index 0000000..eb37f08
Binary files /dev/null and b/src/static/img/arrowmini.png differ
diff --git a/src/static/img/arrowmore.png b/src/static/img/arrowmore.png
new file mode 100644
index 0000000..4d2fdc8
Binary files /dev/null and b/src/static/img/arrowmore.png differ
diff --git a/src/static/img/baoyang.png b/src/static/img/baoyang.png
new file mode 100644
index 0000000..061e889
Binary files /dev/null and b/src/static/img/baoyang.png differ
diff --git a/src/static/img/baoyangsel.png b/src/static/img/baoyangsel.png
new file mode 100644
index 0000000..e0e5763
Binary files /dev/null and b/src/static/img/baoyangsel.png differ
diff --git a/src/static/img/bingo.png b/src/static/img/bingo.png
new file mode 100644
index 0000000..f6145e8
Binary files /dev/null and b/src/static/img/bingo.png differ
diff --git a/src/static/img/border.png b/src/static/img/border.png
new file mode 100644
index 0000000..8522339
Binary files /dev/null and b/src/static/img/border.png differ
diff --git a/src/static/img/caricon.png b/src/static/img/caricon.png
new file mode 100644
index 0000000..733b280
Binary files /dev/null and b/src/static/img/caricon.png differ
diff --git a/src/static/img/caricon1.png b/src/static/img/caricon1.png
new file mode 100644
index 0000000..36b28aa
Binary files /dev/null and b/src/static/img/caricon1.png differ
diff --git a/src/static/img/cariconwhite.png b/src/static/img/cariconwhite.png
new file mode 100644
index 0000000..cae477b
Binary files /dev/null and b/src/static/img/cariconwhite.png differ
diff --git a/src/static/img/cart.png b/src/static/img/cart.png
new file mode 100644
index 0000000..9701836
Binary files /dev/null and b/src/static/img/cart.png differ
diff --git a/src/static/img/cartselect.png b/src/static/img/cartselect.png
new file mode 100644
index 0000000..bcfab42
Binary files /dev/null and b/src/static/img/cartselect.png differ
diff --git a/src/static/img/cartselected.png b/src/static/img/cartselected.png
new file mode 100644
index 0000000..83454e9
Binary files /dev/null and b/src/static/img/cartselected.png differ
diff --git a/src/static/img/cartshop.png b/src/static/img/cartshop.png
new file mode 100644
index 0000000..e5c877b
Binary files /dev/null and b/src/static/img/cartshop.png differ
diff --git a/src/static/img/choosesize.png b/src/static/img/choosesize.png
new file mode 100644
index 0000000..6f0ee67
Binary files /dev/null and b/src/static/img/choosesize.png differ
diff --git a/src/static/img/choosesizecarpic.png b/src/static/img/choosesizecarpic.png
new file mode 100644
index 0000000..a06aafe
Binary files /dev/null and b/src/static/img/choosesizecarpic.png differ
diff --git a/src/static/img/close.png b/src/static/img/close.png
new file mode 100644
index 0000000..fbc31d7
Binary files /dev/null and b/src/static/img/close.png differ
diff --git a/src/static/img/daolu.png b/src/static/img/daolu.png
new file mode 100644
index 0000000..768ac81
Binary files /dev/null and b/src/static/img/daolu.png differ
diff --git a/src/static/img/del.png b/src/static/img/del.png
new file mode 100644
index 0000000..46a3ad0
Binary files /dev/null and b/src/static/img/del.png differ
diff --git a/src/static/img/delimg.png b/src/static/img/delimg.png
new file mode 100644
index 0000000..19433de
Binary files /dev/null and b/src/static/img/delimg.png differ
diff --git a/src/static/img/edit.png b/src/static/img/edit.png
new file mode 100644
index 0000000..b5c2a68
Binary files /dev/null and b/src/static/img/edit.png differ
diff --git a/src/static/img/ensure.png b/src/static/img/ensure.png
new file mode 100644
index 0000000..f018e54
Binary files /dev/null and b/src/static/img/ensure.png differ
diff --git a/src/static/img/fdj.png b/src/static/img/fdj.png
new file mode 100644
index 0000000..0e52431
Binary files /dev/null and b/src/static/img/fdj.png differ
diff --git a/src/static/img/fdjyh.png b/src/static/img/fdjyh.png
new file mode 100644
index 0000000..0845533
Binary files /dev/null and b/src/static/img/fdjyh.png differ
diff --git a/src/static/img/fenlei.png b/src/static/img/fenlei.png
new file mode 100644
index 0000000..3740408
Binary files /dev/null and b/src/static/img/fenlei.png differ
diff --git a/src/static/img/fenleisel.png b/src/static/img/fenleisel.png
new file mode 100644
index 0000000..b875629
Binary files /dev/null and b/src/static/img/fenleisel.png differ
diff --git a/src/static/img/garagecaricon.png b/src/static/img/garagecaricon.png
new file mode 100644
index 0000000..a2ec86f
Binary files /dev/null and b/src/static/img/garagecaricon.png differ
diff --git a/src/static/img/geted.png b/src/static/img/geted.png
new file mode 100644
index 0000000..ebe980e
Binary files /dev/null and b/src/static/img/geted.png differ
diff --git a/src/static/img/home.png b/src/static/img/home.png
new file mode 100644
index 0000000..d783daf
Binary files /dev/null and b/src/static/img/home.png differ
diff --git a/src/static/img/homesel.png b/src/static/img/homesel.png
new file mode 100644
index 0000000..2ca1615
Binary files /dev/null and b/src/static/img/homesel.png differ
diff --git a/src/static/img/index.png b/src/static/img/index.png
new file mode 100644
index 0000000..39857d9
Binary files /dev/null and b/src/static/img/index.png differ
diff --git a/src/static/img/kefu.png b/src/static/img/kefu.png
new file mode 100644
index 0000000..7e2005f
Binary files /dev/null and b/src/static/img/kefu.png differ
diff --git a/src/static/img/kind.png b/src/static/img/kind.png
new file mode 100644
index 0000000..c8cef97
Binary files /dev/null and b/src/static/img/kind.png differ
diff --git a/src/static/img/kind1.png b/src/static/img/kind1.png
new file mode 100644
index 0000000..3a2d632
Binary files /dev/null and b/src/static/img/kind1.png differ
diff --git a/src/static/img/kind2.png b/src/static/img/kind2.png
new file mode 100644
index 0000000..271f285
Binary files /dev/null and b/src/static/img/kind2.png differ
diff --git a/src/static/img/kt.png b/src/static/img/kt.png
new file mode 100644
index 0000000..004e98f
Binary files /dev/null and b/src/static/img/kt.png differ
diff --git a/src/static/img/lq.png b/src/static/img/lq.png
new file mode 100644
index 0000000..8ba6c59
Binary files /dev/null and b/src/static/img/lq.png differ
diff --git a/src/static/img/miaosha.png b/src/static/img/miaosha.png
new file mode 100644
index 0000000..960f0b3
Binary files /dev/null and b/src/static/img/miaosha.png differ
diff --git a/src/static/img/minebg.png b/src/static/img/minebg.png
new file mode 100644
index 0000000..d6589fa
Binary files /dev/null and b/src/static/img/minebg.png differ
diff --git a/src/static/img/minelogin.png b/src/static/img/minelogin.png
new file mode 100644
index 0000000..d90ea93
Binary files /dev/null and b/src/static/img/minelogin.png differ
diff --git a/src/static/img/more.png b/src/static/img/more.png
new file mode 100644
index 0000000..1ab1e06
Binary files /dev/null and b/src/static/img/more.png differ
diff --git a/src/static/img/off.png b/src/static/img/off.png
new file mode 100644
index 0000000..4bebab3
Binary files /dev/null and b/src/static/img/off.png differ
diff --git a/src/static/img/offer-none.png b/src/static/img/offer-none.png
new file mode 100644
index 0000000..9d6f32b
Binary files /dev/null and b/src/static/img/offer-none.png differ
diff --git a/src/static/img/ordershop.png b/src/static/img/ordershop.png
new file mode 100644
index 0000000..aa019da
Binary files /dev/null and b/src/static/img/ordershop.png differ
diff --git a/src/static/img/person.png b/src/static/img/person.png
new file mode 100644
index 0000000..5b98254
Binary files /dev/null and b/src/static/img/person.png differ
diff --git a/src/static/img/phone.png b/src/static/img/phone.png
new file mode 100644
index 0000000..98f0203
Binary files /dev/null and b/src/static/img/phone.png differ
diff --git a/src/static/img/photo.png b/src/static/img/photo.png
new file mode 100644
index 0000000..02f0109
Binary files /dev/null and b/src/static/img/photo.png differ
diff --git a/src/static/img/pingjia.png b/src/static/img/pingjia.png
new file mode 100644
index 0000000..b1ad987
Binary files /dev/null and b/src/static/img/pingjia.png differ
diff --git a/src/static/img/pinpai.png b/src/static/img/pinpai.png
new file mode 100644
index 0000000..236cc3c
Binary files /dev/null and b/src/static/img/pinpai.png differ
diff --git a/src/static/img/pintuandetail.png b/src/static/img/pintuandetail.png
new file mode 100644
index 0000000..60d234b
Binary files /dev/null and b/src/static/img/pintuandetail.png differ
diff --git a/src/static/img/pintuanensure.png b/src/static/img/pintuanensure.png
new file mode 100644
index 0000000..bd5b392
Binary files /dev/null and b/src/static/img/pintuanensure.png differ
diff --git a/src/static/img/pintuanuser.png b/src/static/img/pintuanuser.png
new file mode 100644
index 0000000..0832bf9
Binary files /dev/null and b/src/static/img/pintuanuser.png differ
diff --git a/src/static/img/position.png b/src/static/img/position.png
new file mode 100644
index 0000000..c352939
Binary files /dev/null and b/src/static/img/position.png differ
diff --git a/src/static/img/qys.png b/src/static/img/qys.png
new file mode 100644
index 0000000..fa0e50b
Binary files /dev/null and b/src/static/img/qys.png differ
diff --git a/src/static/img/ranyou.png b/src/static/img/ranyou.png
new file mode 100644
index 0000000..f27f02a
Binary files /dev/null and b/src/static/img/ranyou.png differ
diff --git a/src/static/img/reverse.png b/src/static/img/reverse.png
new file mode 100644
index 0000000..bc0a4e6
Binary files /dev/null and b/src/static/img/reverse.png differ
diff --git a/src/static/img/search.png b/src/static/img/search.png
new file mode 100644
index 0000000..f62ae27
Binary files /dev/null and b/src/static/img/search.png differ
diff --git a/src/static/img/search1.png b/src/static/img/search1.png
new file mode 100644
index 0000000..9f04d67
Binary files /dev/null and b/src/static/img/search1.png differ
diff --git a/src/static/img/searchshop.png b/src/static/img/searchshop.png
new file mode 100644
index 0000000..644f588
Binary files /dev/null and b/src/static/img/searchshop.png differ
diff --git a/src/static/img/seckillad1.png b/src/static/img/seckillad1.png
new file mode 100644
index 0000000..139ee5f
Binary files /dev/null and b/src/static/img/seckillad1.png differ
diff --git a/src/static/img/seckillad2.png b/src/static/img/seckillad2.png
new file mode 100644
index 0000000..9a78a9b
Binary files /dev/null and b/src/static/img/seckillad2.png differ
diff --git a/src/static/img/seckilldetail.png b/src/static/img/seckilldetail.png
new file mode 100644
index 0000000..a9aba9e
Binary files /dev/null and b/src/static/img/seckilldetail.png differ
diff --git a/src/static/img/seckillshop.png b/src/static/img/seckillshop.png
new file mode 100644
index 0000000..ee9b992
Binary files /dev/null and b/src/static/img/seckillshop.png differ
diff --git a/src/static/img/seckillshopdetail.png b/src/static/img/seckillshopdetail.png
new file mode 100644
index 0000000..a9aba9e
Binary files /dev/null and b/src/static/img/seckillshopdetail.png differ
diff --git a/src/static/img/seckilltopbg.png b/src/static/img/seckilltopbg.png
new file mode 100644
index 0000000..d95118f
Binary files /dev/null and b/src/static/img/seckilltopbg.png differ
diff --git a/src/static/img/select.png b/src/static/img/select.png
new file mode 100644
index 0000000..de93e66
Binary files /dev/null and b/src/static/img/select.png differ
diff --git a/src/static/img/selected.png b/src/static/img/selected.png
new file mode 100644
index 0000000..856f4b2
Binary files /dev/null and b/src/static/img/selected.png differ
diff --git a/src/static/img/serve.png b/src/static/img/serve.png
new file mode 100644
index 0000000..08083cb
Binary files /dev/null and b/src/static/img/serve.png differ
diff --git a/src/static/img/server.png b/src/static/img/server.png
new file mode 100644
index 0000000..37fa6c4
Binary files /dev/null and b/src/static/img/server.png differ
diff --git a/src/static/img/serviceicon.png b/src/static/img/serviceicon.png
new file mode 100644
index 0000000..332aaf5
Binary files /dev/null and b/src/static/img/serviceicon.png differ
diff --git a/src/static/img/serviceshop.png b/src/static/img/serviceshop.png
new file mode 100644
index 0000000..465dbb1
Binary files /dev/null and b/src/static/img/serviceshop.png differ
diff --git a/src/static/img/shaixuan.png b/src/static/img/shaixuan.png
new file mode 100644
index 0000000..c8b4827
Binary files /dev/null and b/src/static/img/shaixuan.png differ
diff --git a/src/static/img/shaixuanline.png b/src/static/img/shaixuanline.png
new file mode 100644
index 0000000..54a6b45
Binary files /dev/null and b/src/static/img/shaixuanline.png differ
diff --git a/src/static/img/shaixuannull.png b/src/static/img/shaixuannull.png
new file mode 100644
index 0000000..0a9a9b6
Binary files /dev/null and b/src/static/img/shaixuannull.png differ
diff --git a/src/static/img/shop1.png b/src/static/img/shop1.png
new file mode 100644
index 0000000..bd781ea
Binary files /dev/null and b/src/static/img/shop1.png differ
diff --git a/src/static/img/shop2.png b/src/static/img/shop2.png
new file mode 100644
index 0000000..ef3bbbc
Binary files /dev/null and b/src/static/img/shop2.png differ
diff --git a/src/static/img/shop3.png b/src/static/img/shop3.png
new file mode 100644
index 0000000..522a0da
Binary files /dev/null and b/src/static/img/shop3.png differ
diff --git a/src/static/img/shoplb.png b/src/static/img/shoplb.png
new file mode 100644
index 0000000..95e9274
Binary files /dev/null and b/src/static/img/shoplb.png differ
diff --git a/src/static/img/shoppic.png b/src/static/img/shoppic.png
new file mode 100644
index 0000000..9bfc44c
Binary files /dev/null and b/src/static/img/shoppic.png differ
diff --git a/src/static/img/shoppic1.png b/src/static/img/shoppic1.png
new file mode 100644
index 0000000..559ea6a
Binary files /dev/null and b/src/static/img/shoppic1.png differ
diff --git a/src/static/img/shoppingnull.png b/src/static/img/shoppingnull.png
new file mode 100644
index 0000000..bfae015
Binary files /dev/null and b/src/static/img/shoppingnull.png differ
diff --git a/src/static/img/shoucang.png b/src/static/img/shoucang.png
new file mode 100644
index 0000000..caacffa
Binary files /dev/null and b/src/static/img/shoucang.png differ
diff --git a/src/static/img/shouhou.png b/src/static/img/shouhou.png
new file mode 100644
index 0000000..e03ce2e
Binary files /dev/null and b/src/static/img/shouhou.png differ
diff --git a/src/static/img/star.png b/src/static/img/star.png
new file mode 100644
index 0000000..79644e6
Binary files /dev/null and b/src/static/img/star.png differ
diff --git a/src/static/img/successale.png b/src/static/img/successale.png
new file mode 100644
index 0000000..1077728
Binary files /dev/null and b/src/static/img/successale.png differ
diff --git a/src/static/img/swiper.png b/src/static/img/swiper.png
new file mode 100644
index 0000000..8f8d951
Binary files /dev/null and b/src/static/img/swiper.png differ
diff --git a/src/static/img/tel.png b/src/static/img/tel.png
new file mode 100644
index 0000000..fc5540c
Binary files /dev/null and b/src/static/img/tel.png differ
diff --git a/src/static/img/uphoto.png b/src/static/img/uphoto.png
new file mode 100644
index 0000000..f74c443
Binary files /dev/null and b/src/static/img/uphoto.png differ
diff --git a/src/static/img/userphoto.png b/src/static/img/userphoto.png
new file mode 100644
index 0000000..9cb7130
Binary files /dev/null and b/src/static/img/userphoto.png differ
diff --git a/src/static/img/usertx.png b/src/static/img/usertx.png
new file mode 100644
index 0000000..5c7db08
Binary files /dev/null and b/src/static/img/usertx.png differ
diff --git a/src/static/img/wallet.png b/src/static/img/wallet.png
new file mode 100644
index 0000000..63da4a5
Binary files /dev/null and b/src/static/img/wallet.png differ
diff --git a/src/static/img/wechaticon.png b/src/static/img/wechaticon.png
new file mode 100644
index 0000000..035dbcf
Binary files /dev/null and b/src/static/img/wechaticon.png differ
diff --git a/src/static/img/wode.png b/src/static/img/wode.png
new file mode 100644
index 0000000..500c90a
Binary files /dev/null and b/src/static/img/wode.png differ
diff --git a/src/static/img/wodesel.png b/src/static/img/wodesel.png
new file mode 100644
index 0000000..feb5f5a
Binary files /dev/null and b/src/static/img/wodesel.png differ
diff --git a/src/static/img/xiala.png b/src/static/img/xiala.png
new file mode 100644
index 0000000..2964188
Binary files /dev/null and b/src/static/img/xiala.png differ
diff --git a/src/static/img/xialared.png b/src/static/img/xialared.png
new file mode 100644
index 0000000..b024ee6
Binary files /dev/null and b/src/static/img/xialared.png differ
diff --git a/src/static/img/xingw.png b/src/static/img/xingw.png
new file mode 100644
index 0000000..82bd5ec
Binary files /dev/null and b/src/static/img/xingw.png differ
diff --git a/src/static/img/xingz.png b/src/static/img/xingz.png
new file mode 100644
index 0000000..76d94f5
Binary files /dev/null and b/src/static/img/xingz.png differ
diff --git a/src/static/img/yhqbj.png b/src/static/img/yhqbj.png
new file mode 100644
index 0000000..3c02402
Binary files /dev/null and b/src/static/img/yhqbj.png differ
diff --git a/src/static/img/yq.png b/src/static/img/yq.png
new file mode 100644
index 0000000..39dbd24
Binary files /dev/null and b/src/static/img/yq.png differ
diff --git a/src/static/js/request.js b/src/static/js/request.js
new file mode 100644
index 0000000..70daf14
--- /dev/null
+++ b/src/static/js/request.js
@@ -0,0 +1,56 @@
+function requestP(options = {}) {
+    let {
+        url,
+        data,
+        header,
+        method,
+        dataType,
+        responseType,
+        success,
+        fail,
+        complete
+    } = options;
+    uni.showLoading({title:"加载中",mask:true,})
+    const host = "https://car.zgwl66.com/index.php/Api/"
+    if (method == "post" || method == "POST") {
+        if (header == undefined) {
+            header = {}
+        }
+        header['content-type'] = 'application/x-www-form-urlencoded'
+    }
+    if(data == undefined){
+        data = {}
+    }
+    data.openid = uni.getStorageSync("openid")
+    return new Promise((res, rej) => {
+        console.log(host + url)
+        uni.request({
+            url: host + url,
+            data,
+            header,
+            method,
+            dataType,
+            responseType,
+            success(r) {
+                uni.hideLoading()
+                if(r.data.code == 0){
+                    uni.showToast({
+                        title:r.data.msg,
+                        icon:"none"
+                    })
+                    rej({msg:"验证失败"})
+                }else{
+                    res(r);
+                }
+            },
+            fail(err) {
+                wx.hideLoading()
+                rej(err);
+            },
+            complete
+        });
+    });
+}
+module.exports = {
+    requestP: requestP
+  }
\ No newline at end of file
diff --git a/yarn.lock b/yarn.lock
index cf7cd26..a306251 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1447,6 +1447,11 @@
   resolved "https://registry.npm.taobao.org/@xtuc/long/download/@xtuc/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d"
   integrity sha1-0pHGpOl5ibXGHZrPOWrk/hM6cY0=
 
+abbrev@1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
+  integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
+
 accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.7:
   version "1.3.7"
   resolved "https://registry.npm.taobao.org/accepts/download/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd"
@@ -1515,6 +1520,11 @@ alphanum-sort@^1.0.0:
   resolved "https://registry.npm.taobao.org/alphanum-sort/download/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3"
   integrity sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM=
 
+amdefine@>=0.0.4:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
+  integrity sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=
+
 ansi-colors@^3.0.0:
   version "3.2.4"
   resolved "https://registry.npm.taobao.org/ansi-colors/download/ansi-colors-3.2.4.tgz#e3a3da4bfbae6c86a9c285625de124a234026fbf"
@@ -1578,7 +1588,7 @@ anymatch@^2.0.0:
     micromatch "^3.1.4"
     normalize-path "^2.1.1"
 
-aproba@^1.1.1:
+aproba@^1.0.3, aproba@^1.1.1:
   version "1.2.0"
   resolved "https://registry.npm.taobao.org/aproba/download/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
   integrity sha1-aALmJk79GMeQobDVF/DyYnvyyUo=
@@ -1588,6 +1598,14 @@ arch@^2.1.1:
   resolved "https://registry.npm.taobao.org/arch/download/arch-2.1.1.tgz#8f5c2731aa35a30929221bb0640eed65175ec84e"
   integrity sha1-j1wnMao1owkpIhuwZA7tZRdeyE4=
 
+are-we-there-yet@~1.1.2:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21"
+  integrity sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==
+  dependencies:
+    delegates "^1.0.0"
+    readable-stream "^2.0.6"
+
 argparse@^1.0.7:
   version "1.0.10"
   resolved "https://registry.npm.taobao.org/argparse/download/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
@@ -1610,6 +1628,11 @@ arr-union@^3.1.0:
   resolved "https://registry.npm.taobao.org/arr-union/download/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
   integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=
 
+array-find-index@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1"
+  integrity sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=
+
 array-flatten@1.1.1:
   version "1.1.1"
   resolved "https://registry.npm.taobao.org/array-flatten/download/array-flatten-1.1.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Farray-flatten%2Fdownload%2Farray-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
@@ -1676,6 +1699,11 @@ async-each@^1.0.1:
   resolved "https://registry.npm.taobao.org/async-each/download/async-each-1.0.3.tgz#b727dbf87d7651602f06f4d4ac387f47d91b0cbf"
   integrity sha1-tyfb+H12UWAvBvTUrDh/R9kbDL8=
 
+async-foreach@^0.1.3:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/async-foreach/-/async-foreach-0.1.3.tgz#36121f845c0578172de419a97dbeb1d16ec34542"
+  integrity sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI=
+
 async-limiter@~1.0.0:
   version "1.0.1"
   resolved "https://registry.npm.taobao.org/async-limiter/download/async-limiter-1.0.1.tgz?cache=0&sync_timestamp=1574271635932&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fasync-limiter%2Fdownload%2Fasync-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd"
@@ -1829,6 +1857,13 @@ bindings@^1.5.0:
   dependencies:
     file-uri-to-path "1.0.0"
 
+block-stream@*:
+  version "0.0.9"
+  resolved "https://registry.yarnpkg.com/block-stream/-/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a"
+  integrity sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=
+  dependencies:
+    inherits "~2.0.0"
+
 bluebird@^3.1.1, bluebird@^3.5.1, bluebird@^3.5.5:
   version "3.7.2"
   resolved "https://registry.npm.taobao.org/bluebird/download/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
@@ -2136,6 +2171,24 @@ camel-case@3.0.x:
     no-case "^2.2.0"
     upper-case "^1.1.1"
 
+camelcase-keys@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-2.1.0.tgz#308beeaffdf28119051efa1d932213c91b8f92e7"
+  integrity sha1-MIvur/3ygRkFHvodkyITyRuPkuc=
+  dependencies:
+    camelcase "^2.0.0"
+    map-obj "^1.0.0"
+
+camelcase@^2.0.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"
+  integrity sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=
+
+camelcase@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"
+  integrity sha1-MvxLn82vhF/N9+c7uXysImHwqwo=
+
 camelcase@^5.0.0, camelcase@^5.3.1:
   version "5.3.1"
   resolved "https://registry.npm.taobao.org/camelcase/download/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
@@ -2166,7 +2219,7 @@ caseless@~0.12.0:
   resolved "https://registry.npm.taobao.org/caseless/download/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
   integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=
 
-chalk@^1.1.3:
+chalk@^1.1.1, chalk@^1.1.3:
   version "1.1.3"
   resolved "https://registry.npm.taobao.org/chalk/download/chalk-1.1.3.tgz?cache=0&sync_timestamp=1573282918610&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fchalk%2Fdownload%2Fchalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
   integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=
@@ -2292,6 +2345,15 @@ clipboardy@^2.0.0:
     arch "^2.1.1"
     execa "^1.0.0"
 
+cliui@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d"
+  integrity sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=
+  dependencies:
+    string-width "^1.0.1"
+    strip-ansi "^3.0.1"
+    wrap-ansi "^2.0.0"
+
 cliui@^4.0.0:
   version "4.1.0"
   resolved "https://registry.npm.taobao.org/cliui/download/cliui-4.1.0.tgz?cache=0&sync_timestamp=1573943106490&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcliui%2Fdownload%2Fcliui-4.1.0.tgz#348422dbe82d800b3022eef4f6ac10bf2e4d1b49"
@@ -2319,6 +2381,15 @@ cliui@^6.0.0:
     strip-ansi "^6.0.0"
     wrap-ansi "^6.2.0"
 
+clone-deep@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387"
+  integrity sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==
+  dependencies:
+    is-plain-object "^2.0.4"
+    kind-of "^6.0.2"
+    shallow-clone "^3.0.0"
+
 clone@^1.0.2:
   version "1.0.4"
   resolved "https://registry.npm.taobao.org/clone/download/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
@@ -2463,6 +2534,11 @@ console-browserify@^1.1.0:
   resolved "https://registry.npm.taobao.org/console-browserify/download/console-browserify-1.2.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fconsole-browserify%2Fdownload%2Fconsole-browserify-1.2.0.tgz#67063cef57ceb6cf4993a2ab3a55840ae8c49336"
   integrity sha1-ZwY871fOts9Jk6KrOlWECujEkzY=
 
+console-control-strings@^1.0.0, console-control-strings@~1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
+  integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=
+
 consolidate@^0.15.1:
   version "0.15.1"
   resolved "https://registry.npm.taobao.org/consolidate/download/consolidate-0.15.1.tgz#21ab043235c71a07d45d9aad98593b0dba56bab7"
@@ -2611,6 +2687,14 @@ cross-env@^5.2.0:
   dependencies:
     cross-spawn "^6.0.5"
 
+cross-spawn@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-3.0.1.tgz#1256037ecb9f0c5f79e3d6ef135e30770184b982"
+  integrity sha1-ElYDfsufDF9549bvE14wdwGEuYI=
+  dependencies:
+    lru-cache "^4.0.1"
+    which "^1.2.9"
+
 cross-spawn@^6.0.0, cross-spawn@^6.0.5:
   version "6.0.5"
   resolved "https://registry.npm.taobao.org/cross-spawn/download/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
@@ -2827,6 +2911,13 @@ current-script-polyfill@^1.0.0:
   resolved "https://registry.npm.taobao.org/current-script-polyfill/download/current-script-polyfill-1.0.0.tgz#f31cf7e4f3e218b0726e738ca92a02d3488ef615"
   integrity sha1-8xz35PPiGLBybnOMqSoC00iO9hU=
 
+currently-unhandled@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea"
+  integrity sha1-mI3zP+qxke95mmE2nddsF635V+o=
+  dependencies:
+    array-find-index "^1.0.1"
+
 cyclist@^1.0.1:
   version "1.0.1"
   resolved "https://registry.npm.taobao.org/cyclist/download/cyclist-1.0.1.tgz#596e9698fd0c80e12038c2b82d6eb1b35b6224d9"
@@ -2865,7 +2956,7 @@ debug@^4.1.0, debug@^4.1.1:
   dependencies:
     ms "^2.1.1"
 
-decamelize@^1.2.0:
+decamelize@^1.1.1, decamelize@^1.1.2, decamelize@^1.2.0:
   version "1.2.0"
   resolved "https://registry.npm.taobao.org/decamelize/download/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
   integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
@@ -2971,6 +3062,11 @@ delayed-stream@~1.0.0:
   resolved "https://registry.npm.taobao.org/delayed-stream/download/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
   integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
 
+delegates@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
+  integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=
+
 depd@~1.1.2:
   version "1.1.2"
   resolved "https://registry.npm.taobao.org/depd/download/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
@@ -3214,7 +3310,7 @@ errno@^0.1.3, errno@~0.1.7:
   dependencies:
     prr "~1.0.1"
 
-error-ex@^1.3.1:
+error-ex@^1.2.0, error-ex@^1.3.1:
   version "1.3.2"
   resolved "https://registry.npm.taobao.org/error-ex/download/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
   integrity sha1-tKxAZIEH/c3PriQvQovqihTU8b8=
@@ -3590,6 +3686,14 @@ find-cache-dir@^3.0.0, find-cache-dir@^3.2.0:
     make-dir "^3.0.0"
     pkg-dir "^4.1.0"
 
+find-up@^1.0.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"
+  integrity sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=
+  dependencies:
+    path-exists "^2.0.0"
+    pinkie-promise "^2.0.0"
+
 find-up@^2.1.0:
   version "2.1.0"
   resolved "https://registry.npm.taobao.org/find-up/download/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
@@ -3717,11 +3821,42 @@ fsevents@^1.2.7:
     bindings "^1.5.0"
     nan "^2.12.1"
 
+fstream@^1.0.0, fstream@^1.0.12:
+  version "1.0.12"
+  resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.12.tgz#4e8ba8ee2d48be4f7d0de505455548eae5932045"
+  integrity sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==
+  dependencies:
+    graceful-fs "^4.1.2"
+    inherits "~2.0.0"
+    mkdirp ">=0.5 0"
+    rimraf "2"
+
 function-bind@^1.1.1:
   version "1.1.1"
   resolved "https://registry.npm.taobao.org/function-bind/download/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
   integrity sha1-pWiZ0+o8m6uHS7l3O3xe3pL0iV0=
 
+gauge@~2.7.3:
+  version "2.7.4"
+  resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
+  integrity sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=
+  dependencies:
+    aproba "^1.0.3"
+    console-control-strings "^1.0.0"
+    has-unicode "^2.0.0"
+    object-assign "^4.1.0"
+    signal-exit "^3.0.0"
+    string-width "^1.0.1"
+    strip-ansi "^3.0.1"
+    wide-align "^1.1.0"
+
+gaze@^1.0.0:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/gaze/-/gaze-1.1.3.tgz#c441733e13b927ac8c0ff0b4c3b033f28812924a"
+  integrity sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==
+  dependencies:
+    globule "^1.0.0"
+
 get-caller-file@^1.0.1:
   version "1.0.3"
   resolved "https://registry.npm.taobao.org/get-caller-file/download/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a"
@@ -3732,6 +3867,11 @@ get-caller-file@^2.0.1:
   resolved "https://registry.npm.taobao.org/get-caller-file/download/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
   integrity sha1-T5RBKoLbMvNuOwuXQfipf+sDH34=
 
+get-stdin@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
+  integrity sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=
+
 get-stream@^4.0.0:
   version "4.1.0"
   resolved "https://registry.npm.taobao.org/get-stream/download/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
@@ -3771,7 +3911,7 @@ glob-to-regexp@^0.3.0:
   resolved "https://registry.npm.taobao.org/glob-to-regexp/download/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab"
   integrity sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs=
 
-glob@^7.0.3, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4:
+glob@^7.0.0, glob@^7.0.3, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@~7.1.1:
   version "7.1.6"
   resolved "https://registry.npm.taobao.org/glob/download/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
   integrity sha1-FB8zuBp8JJLhJVlDB0gMRmeSeKY=
@@ -3825,6 +3965,15 @@ globby@^9.2.0:
     pify "^4.0.1"
     slash "^2.0.0"
 
+globule@^1.0.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/globule/-/globule-1.3.0.tgz#41d0e9fb44afd4b80d93a23263714f90b3dec904"
+  integrity sha512-YlD4kdMqRCQHrhVdonet4TdRtv1/sZKepvoxNT4Nrhrp5HI8XFfc8kFlGlBn2myBo80aGp8Eft259mbcUJhgSg==
+  dependencies:
+    glob "~7.1.1"
+    lodash "~4.17.10"
+    minimatch "~3.0.2"
+
 graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.2:
   version "4.2.3"
   resolved "https://registry.npm.taobao.org/graceful-fs/download/graceful-fs-4.2.3.tgz#4a12ff1b60376ef09862c2093edd908328be8423"
@@ -3889,6 +4038,11 @@ has-symbols@^1.0.0, has-symbols@^1.0.1:
   resolved "https://registry.npm.taobao.org/has-symbols/download/has-symbols-1.0.1.tgz?cache=0&sync_timestamp=1573950719586&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fhas-symbols%2Fdownload%2Fhas-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8"
   integrity sha1-n1IUdYpEGWxAbZvXbOv4HsLdMeg=
 
+has-unicode@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
+  integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=
+
 has-value@^0.3.1:
   version "0.3.1"
   resolved "https://registry.npm.taobao.org/has-value/download/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f"
@@ -4206,6 +4360,18 @@ imurmurhash@^0.1.4:
   resolved "https://registry.npm.taobao.org/imurmurhash/download/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
   integrity sha1-khi5srkoojixPcT7a21XbyMUU+o=
 
+in-publish@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/in-publish/-/in-publish-2.0.0.tgz#e20ff5e3a2afc2690320b6dc552682a9c7fadf51"
+  integrity sha1-4g/146KvwmkDILbcVSaCqcf631E=
+
+indent-string@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-2.1.0.tgz#8e2d48348742121b4a8218b7a137e9a52049dc80"
+  integrity sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=
+  dependencies:
+    repeating "^2.0.0"
+
 indent-string@^4.0.0:
   version "4.0.0"
   resolved "https://registry.npm.taobao.org/indent-string/download/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251"
@@ -4229,7 +4395,7 @@ inflight@^1.0.4:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.1, inherits@~2.0.3:
+inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3:
   version "2.0.4"
   resolved "https://registry.npm.taobao.org/inherits/download/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
   integrity sha1-D6LGT5MpF8NDOg3tVTY6rjdBa3w=
@@ -4269,6 +4435,11 @@ invariant@^2.2.2:
   dependencies:
     loose-envify "^1.0.0"
 
+invert-kv@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"
+  integrity sha1-EEqOSqym09jNFXqO+L+rLXo//bY=
+
 invert-kv@^2.0.0:
   version "2.0.0"
   resolved "https://registry.npm.taobao.org/invert-kv/download/invert-kv-2.0.0.tgz#7393f5afa59ec9ff5f67a27620d11c226e3eec02"
@@ -4421,6 +4592,13 @@ is-extglob@^2.1.0, is-extglob@^2.1.1:
   resolved "https://registry.npm.taobao.org/is-extglob/download/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
   integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
 
+is-finite@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.0.2.tgz#cc6677695602be550ef11e8b4aa6305342b6d0aa"
+  integrity sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=
+  dependencies:
+    number-is-nan "^1.0.0"
+
 is-fullwidth-code-point@^1.0.0:
   version "1.0.0"
   resolved "https://registry.npm.taobao.org/is-fullwidth-code-point/download/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
@@ -4536,6 +4714,11 @@ is-typedarray@~1.0.0:
   resolved "https://registry.npm.taobao.org/is-typedarray/download/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
   integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
 
+is-utf8@^0.2.0:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
+  integrity sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=
+
 is-windows@^1.0.2:
   version "1.0.2"
   resolved "https://registry.npm.taobao.org/is-windows/download/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
@@ -4586,6 +4769,11 @@ jest-worker@^24.9.0:
     merge-stream "^2.0.0"
     supports-color "^6.1.0"
 
+js-base64@^2.1.8:
+  version "2.5.1"
+  resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.5.1.tgz#1efa39ef2c5f7980bb1784ade4a8af2de3291121"
+  integrity sha512-M7kLczedRMYX4L8Mdh4MzyAMM9O5osx+4FcOQuTvr3A9F2D9S5JXheN0ewNbrvK2UatkTRhL5ejGmGSjNMiZuw==
+
 js-levenshtein@^1.1.3:
   version "1.1.6"
   resolved "https://registry.npm.taobao.org/js-levenshtein/download/js-levenshtein-1.1.6.tgz#c6cee58eb3550372df8deb85fad5ce66ce01d59d"
@@ -4736,6 +4924,13 @@ launch-editor@^2.2.1:
     chalk "^2.3.0"
     shell-quote "^1.6.1"
 
+lcid@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835"
+  integrity sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=
+  dependencies:
+    invert-kv "^1.0.0"
+
 lcid@^2.0.0:
   version "2.0.0"
   resolved "https://registry.npm.taobao.org/lcid/download/lcid-2.0.0.tgz#6ef5d2df60e52f82eb228a4c373e8d1f397253cf"
@@ -4756,6 +4951,17 @@ lines-and-columns@^1.1.6:
   resolved "https://registry.npm.taobao.org/lines-and-columns/download/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00"
   integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=
 
+load-json-file@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
+  integrity sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=
+  dependencies:
+    graceful-fs "^4.1.2"
+    parse-json "^2.2.0"
+    pify "^2.0.0"
+    pinkie-promise "^2.0.0"
+    strip-bom "^2.0.0"
+
 loader-runner@^2.3.0, loader-runner@^2.3.1, loader-runner@^2.4.0:
   version "2.4.0"
   resolved "https://registry.npm.taobao.org/loader-runner/download/loader-runner-2.4.0.tgz#ed47066bfe534d7e84c4c7b9998c2a75607d9357"
@@ -4833,7 +5039,7 @@ lodash.uniq@^4.5.0:
   resolved "https://registry.npm.taobao.org/lodash.uniq/download/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
   integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=
 
-lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.3:
+lodash@^4.0.0, lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.3, lodash@~4.17.10:
   version "4.17.15"
   resolved "https://registry.npm.taobao.org/lodash/download/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
   integrity sha1-tEf2ZwoEVbv+7dETku/zMOoJdUg=
@@ -4857,12 +5063,20 @@ loose-envify@^1.0.0:
   dependencies:
     js-tokens "^3.0.0 || ^4.0.0"
 
+loud-rejection@^1.0.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/loud-rejection/-/loud-rejection-1.6.0.tgz#5b46f80147edee578870f086d04821cf998e551f"
+  integrity sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=
+  dependencies:
+    currently-unhandled "^0.4.1"
+    signal-exit "^3.0.0"
+
 lower-case@^1.1.1:
   version "1.1.4"
   resolved "https://registry.npm.taobao.org/lower-case/download/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac"
   integrity sha1-miyr0bno4K6ZOkv31YdcOcQujqw=
 
-lru-cache@^4.1.1, lru-cache@^4.1.2:
+lru-cache@^4.0.1, lru-cache@^4.1.1, lru-cache@^4.1.2:
   version "4.1.5"
   resolved "https://registry.npm.taobao.org/lru-cache/download/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd"
   integrity sha1-i75Q6oW+1ZvJ4z3KuCNe6bz0Q80=
@@ -4916,6 +5130,11 @@ map-cache@^0.2.2:
   resolved "https://registry.npm.taobao.org/map-cache/download/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
   integrity sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=
 
+map-obj@^1.0.0, map-obj@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"
+  integrity sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=
+
 map-visit@^1.0.0:
   version "1.0.0"
   resolved "https://registry.npm.taobao.org/map-visit/download/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"
@@ -4967,6 +5186,22 @@ memory-fs@^0.5.0:
     errno "^0.1.3"
     readable-stream "^2.0.1"
 
+meow@^3.7.0:
+  version "3.7.0"
+  resolved "https://registry.yarnpkg.com/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb"
+  integrity sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=
+  dependencies:
+    camelcase-keys "^2.0.0"
+    decamelize "^1.1.2"
+    loud-rejection "^1.0.0"
+    map-obj "^1.0.1"
+    minimist "^1.1.3"
+    normalize-package-data "^2.3.4"
+    object-assign "^4.0.1"
+    read-pkg-up "^1.0.1"
+    redent "^1.0.0"
+    trim-newlines "^1.0.0"
+
 merge-descriptors@1.0.1:
   version "1.0.1"
   resolved "https://registry.npm.taobao.org/merge-descriptors/download/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
@@ -5083,7 +5318,7 @@ minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
   resolved "https://registry.npm.taobao.org/minimalistic-crypto-utils/download/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
   integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=
 
-minimatch@^3.0.4:
+minimatch@^3.0.4, minimatch@~3.0.2:
   version "3.0.4"
   resolved "https://registry.npm.taobao.org/minimatch/download/minimatch-3.0.4.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fminimatch%2Fdownload%2Fminimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
   integrity sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=
@@ -5095,7 +5330,7 @@ minimist@0.0.8:
   resolved "https://registry.npm.taobao.org/minimist/download/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
   integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=
 
-minimist@^1.2.0:
+minimist@^1.1.3, minimist@^1.2.0:
   version "1.2.0"
   resolved "https://registry.npm.taobao.org/minimist/download/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
   integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=
@@ -5178,7 +5413,7 @@ mixin-deep@^1.2.0:
     for-in "^1.0.2"
     is-extendable "^1.0.1"
 
-mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1:
+"mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1:
   version "0.5.1"
   resolved "https://registry.npm.taobao.org/mkdirp/download/mkdirp-0.5.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmkdirp%2Fdownload%2Fmkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
   integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=
@@ -5239,7 +5474,7 @@ mz@^2.4.0:
     object-assign "^4.0.1"
     thenify-all "^1.0.0"
 
-nan@^2.12.1:
+nan@^2.12.1, nan@^2.13.2:
   version "2.14.0"
   resolved "https://registry.npm.taobao.org/nan/download/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c"
   integrity sha1-eBj3IgJ7JFmobwKV1DTR/CM2xSw=
@@ -5288,6 +5523,24 @@ node-forge@0.9.0:
   resolved "https://registry.npm.taobao.org/node-forge/download/node-forge-0.9.0.tgz?cache=0&sync_timestamp=1569524669712&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fnode-forge%2Fdownload%2Fnode-forge-0.9.0.tgz#d624050edbb44874adca12bb9a52ec63cb782579"
   integrity sha1-1iQFDtu0SHStyhK7mlLsY8t4JXk=
 
+node-gyp@^3.8.0:
+  version "3.8.0"
+  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-3.8.0.tgz#540304261c330e80d0d5edce253a68cb3964218c"
+  integrity sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==
+  dependencies:
+    fstream "^1.0.0"
+    glob "^7.0.3"
+    graceful-fs "^4.1.2"
+    mkdirp "^0.5.0"
+    nopt "2 || 3"
+    npmlog "0 || 1 || 2 || 3 || 4"
+    osenv "0"
+    request "^2.87.0"
+    rimraf "2"
+    semver "~5.3.0"
+    tar "^2.0.0"
+    which "1"
+
 node-ipc@^9.1.1:
   version "9.1.1"
   resolved "https://registry.npm.taobao.org/node-ipc/download/node-ipc-9.1.1.tgz#4e245ed6938e65100e595ebc5dc34b16e8dd5d69"
@@ -5333,7 +5586,37 @@ node-releases@^1.1.42:
   dependencies:
     semver "^6.3.0"
 
-normalize-package-data@^2.5.0:
+node-sass@^4.13.0:
+  version "4.13.0"
+  resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.13.0.tgz#b647288babdd6a1cb726de4545516b31f90da066"
+  integrity sha512-W1XBrvoJ1dy7VsvTAS5q1V45lREbTlZQqFbiHb3R3OTTCma0XBtuG6xZ6Z4506nR4lmHPTqVRwxT6KgtWC97CA==
+  dependencies:
+    async-foreach "^0.1.3"
+    chalk "^1.1.1"
+    cross-spawn "^3.0.0"
+    gaze "^1.0.0"
+    get-stdin "^4.0.1"
+    glob "^7.0.3"
+    in-publish "^2.0.0"
+    lodash "^4.17.15"
+    meow "^3.7.0"
+    mkdirp "^0.5.1"
+    nan "^2.13.2"
+    node-gyp "^3.8.0"
+    npmlog "^4.0.0"
+    request "^2.88.0"
+    sass-graph "^2.2.4"
+    stdout-stream "^1.4.0"
+    "true-case-path" "^1.0.2"
+
+"nopt@2 || 3":
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
+  integrity sha1-xkZdvwirzU2zWTF/eaxopkayj/k=
+  dependencies:
+    abbrev "1"
+
+normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.5.0:
   version "2.5.0"
   resolved "https://registry.npm.taobao.org/normalize-package-data/download/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
   integrity sha1-5m2xg4sgDB38IzIl0SyzZSDiNKg=
@@ -5389,6 +5672,16 @@ npm-run-path@^4.0.0:
   dependencies:
     path-key "^3.0.0"
 
+"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
+  integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==
+  dependencies:
+    are-we-there-yet "~1.1.2"
+    console-control-strings "~1.1.0"
+    gauge "~2.7.3"
+    set-blocking "~2.0.0"
+
 nth-check@^1.0.2, nth-check@~1.0.1:
   version "1.0.2"
   resolved "https://registry.npm.taobao.org/nth-check/download/nth-check-1.0.2.tgz#b2bd295c37e3dd58a3bf0700376663ba4d9cf05c"
@@ -5583,6 +5876,18 @@ os-browserify@^0.3.0:
   resolved "https://registry.npm.taobao.org/os-browserify/download/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27"
   integrity sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=
 
+os-homedir@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
+  integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M=
+
+os-locale@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-1.4.0.tgz#20f9f17ae29ed345e8bde583b13d2009803c14d9"
+  integrity sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=
+  dependencies:
+    lcid "^1.0.0"
+
 os-locale@^3.0.0:
   version "3.1.0"
   resolved "https://registry.npm.taobao.org/os-locale/download/os-locale-3.1.0.tgz#a802a6ee17f24c10483ab9935719cef4ed16bf1a"
@@ -5592,6 +5897,19 @@ os-locale@^3.0.0:
     lcid "^2.0.0"
     mem "^4.0.0"
 
+os-tmpdir@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
+  integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
+
+osenv@0:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
+  integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==
+  dependencies:
+    os-homedir "^1.0.0"
+    os-tmpdir "^1.0.0"
+
 p-defer@^1.0.0:
   version "1.0.0"
   resolved "https://registry.npm.taobao.org/p-defer/download/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"
@@ -5709,6 +6027,13 @@ parse-asn1@^5.0.0:
     pbkdf2 "^3.0.3"
     safe-buffer "^5.1.1"
 
+parse-json@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9"
+  integrity sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=
+  dependencies:
+    error-ex "^1.2.0"
+
 parse-json@^4.0.0:
   version "4.0.0"
   resolved "https://registry.npm.taobao.org/parse-json/download/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0"
@@ -5759,6 +6084,13 @@ path-dirname@^1.0.0:
   resolved "https://registry.npm.taobao.org/path-dirname/download/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0"
   integrity sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=
 
+path-exists@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b"
+  integrity sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=
+  dependencies:
+    pinkie-promise "^2.0.0"
+
 path-exists@^3.0.0:
   version "3.0.0"
   resolved "https://registry.npm.taobao.org/path-exists/download/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
@@ -5799,6 +6131,15 @@ path-to-regexp@0.1.7:
   resolved "https://registry.npm.taobao.org/path-to-regexp/download/path-to-regexp-0.1.7.tgz?cache=0&sync_timestamp=1574278831909&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fpath-to-regexp%2Fdownload%2Fpath-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
   integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=
 
+path-type@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441"
+  integrity sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=
+  dependencies:
+    graceful-fs "^4.1.2"
+    pify "^2.0.0"
+    pinkie-promise "^2.0.0"
+
 path-type@^3.0.0:
   version "3.0.0"
   resolved "https://registry.npm.taobao.org/path-type/download/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f"
@@ -6465,6 +6806,23 @@ read-cache@^1.0.0:
   dependencies:
     pify "^2.3.0"
 
+read-pkg-up@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"
+  integrity sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=
+  dependencies:
+    find-up "^1.0.0"
+    read-pkg "^1.0.0"
+
+read-pkg@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"
+  integrity sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=
+  dependencies:
+    load-json-file "^1.0.0"
+    normalize-package-data "^2.3.2"
+    path-type "^1.0.0"
+
 read-pkg@^5.1.1:
   version "5.2.0"
   resolved "https://registry.npm.taobao.org/read-pkg/download/read-pkg-5.2.0.tgz#7bf295438ca5a33e56cd30e053b34ee7250c93cc"
@@ -6475,7 +6833,7 @@ read-pkg@^5.1.1:
     parse-json "^5.0.0"
     type-fest "^0.6.0"
 
-"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6:
+"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6:
   version "2.3.6"
   resolved "https://registry.npm.taobao.org/readable-stream/download/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
   integrity sha1-sRwn2IuP8fvgcGQ8+UsMea4bCq8=
@@ -6506,6 +6864,14 @@ readdirp@^2.2.1:
     micromatch "^3.1.10"
     readable-stream "^2.0.2"
 
+redent@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/redent/-/redent-1.0.0.tgz#cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde"
+  integrity sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=
+  dependencies:
+    indent-string "^2.1.0"
+    strip-indent "^1.0.1"
+
 regenerate-unicode-properties@^8.1.0:
   version "8.1.0"
   resolved "https://registry.npm.taobao.org/regenerate-unicode-properties/download/regenerate-unicode-properties-8.1.0.tgz#ef51e0f0ea4ad424b77bf7cb41f3e015c70a3f0e"
@@ -6621,6 +6987,13 @@ repeat-string@^1.6.1:
   resolved "https://registry.npm.taobao.org/repeat-string/download/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
   integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=
 
+repeating@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/repeating/-/repeating-2.0.1.tgz#5214c53a926d3552707527fbab415dbc08d06dda"
+  integrity sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=
+  dependencies:
+    is-finite "^1.0.0"
+
 request-promise-core@1.1.3:
   version "1.1.3"
   resolved "https://registry.npm.taobao.org/request-promise-core/download/request-promise-core-1.1.3.tgz#e9a3c081b51380dfea677336061fea879a829ee9"
@@ -6637,7 +7010,7 @@ request-promise-native@^1.0.7, request-promise-native@^1.0.8:
     stealthy-require "^1.1.1"
     tough-cookie "^2.3.3"
 
-request@^2.85.0, request@^2.87.0:
+request@^2.85.0, request@^2.87.0, request@^2.88.0:
   version "2.88.0"
   resolved "https://registry.npm.taobao.org/request/download/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef"
   integrity sha1-nC/KT301tZLv5Xx/ClXoEFIST+8=
@@ -6740,7 +7113,7 @@ rgba-regex@^1.0.0:
   resolved "https://registry.npm.taobao.org/rgba-regex/download/rgba-regex-1.0.0.tgz#43374e2e2ca0968b0ef1523460b7d730ff22eeb3"
   integrity sha1-QzdOLiyglosO8VI0YLfXMP8i7rM=
 
-rimraf@^2.5.4, rimraf@^2.6.2, rimraf@^2.6.3, rimraf@^2.7.1:
+rimraf@2, rimraf@^2.5.4, rimraf@^2.6.2, rimraf@^2.6.3, rimraf@^2.7.1:
   version "2.7.1"
   resolved "https://registry.npm.taobao.org/rimraf/download/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
   integrity sha1-NXl/E6f9rcVmFCwp1PB8ytSD4+w=
@@ -6789,6 +7162,27 @@ safe-regex@^1.1.0:
   resolved "https://registry.npm.taobao.org/safer-buffer/download/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
   integrity sha1-RPoWGwGHuVSd2Eu5GAL5vYOFzWo=
 
+sass-graph@^2.2.4:
+  version "2.2.4"
+  resolved "https://registry.yarnpkg.com/sass-graph/-/sass-graph-2.2.4.tgz#13fbd63cd1caf0908b9fd93476ad43a51d1e0b49"
+  integrity sha1-E/vWPNHK8JCLn9k0dq1DpR0eC0k=
+  dependencies:
+    glob "^7.0.0"
+    lodash "^4.0.0"
+    scss-tokenizer "^0.2.3"
+    yargs "^7.0.0"
+
+sass-loader@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-8.0.0.tgz#e7b07a3e357f965e6b03dd45b016b0a9746af797"
+  integrity sha512-+qeMu563PN7rPdit2+n5uuYVR0SSVwm0JsOUsaJXzgYcClWSlmX0iHDnmeOobPkf5kUglVot3QS6SyLyaQoJ4w==
+  dependencies:
+    clone-deep "^4.0.1"
+    loader-utils "^1.2.3"
+    neo-async "^2.6.1"
+    schema-utils "^2.1.0"
+    semver "^6.3.0"
+
 sax@~1.2.4:
   version "1.2.4"
   resolved "https://registry.npm.taobao.org/sax/download/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
@@ -6811,7 +7205,7 @@ schema-utils@^1.0.0:
     ajv-errors "^1.0.0"
     ajv-keywords "^3.1.0"
 
-schema-utils@^2.0.0, schema-utils@^2.5.0, schema-utils@^2.6.0, schema-utils@^2.6.1:
+schema-utils@^2.0.0, schema-utils@^2.1.0, schema-utils@^2.5.0, schema-utils@^2.6.0, schema-utils@^2.6.1:
   version "2.6.1"
   resolved "https://registry.npm.taobao.org/schema-utils/download/schema-utils-2.6.1.tgz?cache=0&sync_timestamp=1574946791935&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fschema-utils%2Fdownload%2Fschema-utils-2.6.1.tgz#eb78f0b945c7bcfa2082b3565e8db3548011dc4f"
   integrity sha1-63jwuUXHvPoggrNWXo2zVIAR3E8=
@@ -6819,6 +7213,14 @@ schema-utils@^2.0.0, schema-utils@^2.5.0, schema-utils@^2.6.0, schema-utils@^2.6
     ajv "^6.10.2"
     ajv-keywords "^3.4.1"
 
+scss-tokenizer@^0.2.3:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz#8eb06db9a9723333824d3f5530641149847ce5d1"
+  integrity sha1-jrBtualyMzOCTT9VMGQRSYR85dE=
+  dependencies:
+    js-base64 "^2.1.8"
+    source-map "^0.4.2"
+
 select-hose@^2.0.0:
   version "2.0.0"
   resolved "https://registry.npm.taobao.org/select-hose/download/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca"
@@ -6841,6 +7243,11 @@ semver@^6.0.0, semver@^6.1.0, semver@^6.3.0:
   resolved "https://registry.npm.taobao.org/semver/download/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
   integrity sha1-7gpkyK9ejO6mdoexM3YeG+y9HT0=
 
+semver@~5.3.0:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
+  integrity sha1-myzl094C0XxgEq0yaqa00M9U+U8=
+
 send@0.17.1:
   version "0.17.1"
   resolved "https://registry.npm.taobao.org/send/download/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8"
@@ -6893,7 +7300,7 @@ serve-static@1.14.1:
     parseurl "~1.3.3"
     send "0.17.1"
 
-set-blocking@^2.0.0:
+set-blocking@^2.0.0, set-blocking@~2.0.0:
   version "2.0.0"
   resolved "https://registry.npm.taobao.org/set-blocking/download/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
   integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
@@ -6931,6 +7338,13 @@ sha.js@^2.4.0, sha.js@^2.4.8:
     inherits "^2.0.1"
     safe-buffer "^5.0.1"
 
+shallow-clone@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-3.0.1.tgz#8f2981ad92531f55035b01fb230769a40e02efa3"
+  integrity sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==
+  dependencies:
+    kind-of "^6.0.2"
+
 shebang-command@^1.2.0:
   version "1.2.0"
   resolved "https://registry.npm.taobao.org/shebang-command/download/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
@@ -7073,6 +7487,13 @@ source-map-url@^0.4.0:
   resolved "https://registry.npm.taobao.org/source-map-url/download/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
   integrity sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=
 
+source-map@^0.4.2:
+  version "0.4.4"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
+  integrity sha1-66T12pwNyZneaAMti092FzZSA2s=
+  dependencies:
+    amdefine ">=0.0.4"
+
 source-map@^0.5.0, source-map@^0.5.6:
   version "0.5.7"
   resolved "https://registry.npm.taobao.org/source-map/download/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
@@ -7204,6 +7625,13 @@ static-extend@^0.1.1:
   resolved "https://registry.npm.taobao.org/statuses/download/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
   integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=
 
+stdout-stream@^1.4.0:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/stdout-stream/-/stdout-stream-1.4.1.tgz#5ac174cdd5cd726104aa0c0b2bd83815d8d535de"
+  integrity sha512-j4emi03KXqJWcIeF8eIXkjMFN1Cmb8gUlDYGeBALLPo5qdyTfA9bOtl8m33lRoC+vFMkP3gl0WsDr6+gzxbbTA==
+  dependencies:
+    readable-stream "^2.0.1"
+
 stealthy-require@^1.1.1:
   version "1.1.1"
   resolved "https://registry.npm.taobao.org/stealthy-require/download/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b"
@@ -7246,7 +7674,7 @@ strict-uri-encode@^1.0.0:
   resolved "https://registry.npm.taobao.org/strict-uri-encode/download/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
   integrity sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=
 
-string-width@^1.0.1:
+string-width@^1.0.1, string-width@^1.0.2:
   version "1.0.2"
   resolved "https://registry.npm.taobao.org/string-width/download/string-width-1.0.2.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fstring-width%2Fdownload%2Fstring-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
   integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=
@@ -7255,7 +7683,7 @@ string-width@^1.0.1:
     is-fullwidth-code-point "^1.0.0"
     strip-ansi "^3.0.0"
 
-string-width@^2.0.0, string-width@^2.1.1:
+"string-width@^1.0.2 || 2", string-width@^2.0.0, string-width@^2.1.1:
   version "2.1.1"
   resolved "https://registry.npm.taobao.org/string-width/download/string-width-2.1.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fstring-width%2Fdownload%2Fstring-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
   integrity sha1-q5Pyeo3BPSjKyBXEYhQ6bZASrp4=
@@ -7355,6 +7783,13 @@ strip-ansi@^6.0.0:
   dependencies:
     ansi-regex "^5.0.0"
 
+strip-bom@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"
+  integrity sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=
+  dependencies:
+    is-utf8 "^0.2.0"
+
 strip-eof@^1.0.0:
   version "1.0.0"
   resolved "https://registry.npm.taobao.org/strip-eof/download/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
@@ -7365,6 +7800,13 @@ strip-final-newline@^2.0.0:
   resolved "https://registry.npm.taobao.org/strip-final-newline/download/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"
   integrity sha1-ibhS+y/L6Tb29LMYevsKEsGrWK0=
 
+strip-indent@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-1.0.1.tgz#0c7962a6adefa7bbd4ac366460a638552ae1a0a2"
+  integrity sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=
+  dependencies:
+    get-stdin "^4.0.1"
+
 strip-json-comments@^2.0.1, strip-json-comments@~2.0.1:
   version "2.0.1"
   resolved "https://registry.npm.taobao.org/strip-json-comments/download/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
@@ -7434,6 +7876,15 @@ tapable@^1.0.0, tapable@^1.1.0, tapable@^1.1.3:
   resolved "https://registry.npm.taobao.org/tapable/download/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2"
   integrity sha1-ofzMBrWNth/XpF2i2kT186Pme6I=
 
+tar@^2.0.0:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.2.tgz#0ca8848562c7299b8b446ff6a4d60cdbb23edc40"
+  integrity sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA==
+  dependencies:
+    block-stream "*"
+    fstream "^1.0.12"
+    inherits "2"
+
 terser-webpack-plugin@^1.1.0, terser-webpack-plugin@^1.4.3:
   version "1.4.3"
   resolved "https://registry.npm.taobao.org/terser-webpack-plugin/download/terser-webpack-plugin-1.4.3.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fterser-webpack-plugin%2Fdownload%2Fterser-webpack-plugin-1.4.3.tgz#5ecaf2dbdc5fb99745fd06791f46fc9ddb1c9a7c"
@@ -7581,6 +8032,18 @@ tough-cookie@~2.4.3:
     psl "^1.1.24"
     punycode "^1.4.1"
 
+trim-newlines@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613"
+  integrity sha1-WIeWa7WCpFA6QetST301ARgVphM=
+
+"true-case-path@^1.0.2":
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/true-case-path/-/true-case-path-1.0.3.tgz#f813b5a8c86b40da59606722b144e3225799f47d"
+  integrity sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew==
+  dependencies:
+    glob "^7.1.2"
+
 tryer@^1.0.1:
   version "1.0.1"
   resolved "https://registry.npm.taobao.org/tryer/download/tryer-1.0.1.tgz#f2c85406800b9b0f74c9f7465b81eaad241252f8"
@@ -8106,12 +8569,17 @@ websocket-extensions@>=0.1.1:
   resolved "https://registry.npm.taobao.org/websocket-extensions/download/websocket-extensions-0.1.3.tgz#5d2ff22977003ec687a4b87073dfbbac146ccf29"
   integrity sha1-XS/yKXcAPsaHpLhwc9+7rBRszyk=
 
+which-module@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f"
+  integrity sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=
+
 which-module@^2.0.0:
   version "2.0.0"
   resolved "https://registry.npm.taobao.org/which-module/download/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
   integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
 
-which@^1.2.9:
+which@1, which@^1.2.9:
   version "1.3.1"
   resolved "https://registry.npm.taobao.org/which/download/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
   integrity sha1-pFBD1U9YBTFtqNYvn1CRjT2nCwo=
@@ -8125,6 +8593,13 @@ which@^2.0.1:
   dependencies:
     isexe "^2.0.0"
 
+wide-align@^1.1.0:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457"
+  integrity sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==
+  dependencies:
+    string-width "^1.0.2 || 2"
+
 word-wrap@~1.2.3:
   version "1.2.3"
   resolved "https://registry.npm.taobao.org/word-wrap/download/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
@@ -8197,6 +8672,11 @@ xtend@^4.0.0, xtend@~4.0.1:
   resolved "https://registry.npm.taobao.org/xtend/download/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
   integrity sha1-u3J3n1+kZRhrH0OPZ0+jR/2121Q=
 
+y18n@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"
+  integrity sha1-bRX7qITAhnnA136I53WegR4H+kE=
+
 "y18n@^3.2.1 || ^4.0.0", y18n@^4.0.0:
   version "4.0.0"
   resolved "https://registry.npm.taobao.org/y18n/download/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
@@ -8233,6 +8713,13 @@ yargs-parser@^16.1.0:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
 
+yargs-parser@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-5.0.0.tgz#275ecf0d7ffe05c77e64e7c86e4cd94bf0e1228a"
+  integrity sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=
+  dependencies:
+    camelcase "^3.0.0"
+
 yargs@12.0.5:
   version "12.0.5"
   resolved "https://registry.npm.taobao.org/yargs/download/yargs-12.0.5.tgz#05f5997b609647b64f66b81e3b4b10a368e7ad13"
@@ -8267,3 +8754,22 @@ yargs@^15.0.0:
     which-module "^2.0.0"
     y18n "^4.0.0"
     yargs-parser "^16.1.0"
+
+yargs@^7.0.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-7.1.0.tgz#6ba318eb16961727f5d284f8ea003e8d6154d0c8"
+  integrity sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=
+  dependencies:
+    camelcase "^3.0.0"
+    cliui "^3.2.0"
+    decamelize "^1.1.1"
+    get-caller-file "^1.0.1"
+    os-locale "^1.4.0"
+    read-pkg-up "^1.0.1"
+    require-directory "^2.1.1"
+    require-main-filename "^1.0.1"
+    set-blocking "^2.0.0"
+    string-width "^1.0.2"
+    which-module "^1.0.0"
+    y18n "^3.2.1"
+    yargs-parser "^5.0.0"